fixed theme switching