Fix theme switching