fixed themeswatch