improvements themeswitcher