Improve theme switcher