fixed issues with styleswitcher