Continued stylesheet refactoring.