Fix theme switch