total refactoring of styles in the project