make theme switching more robust, better autocomplete, and reset inactive highlights