fixup themes