Major update for styles