More theme fixups