Even more CSS refactoring.