better theme switcher, correct indentation