modified behaviour of theme switcher