complete fix of all switch updated styles