Total CSS refactoring