Big styles refactoring