CSS refactoring complete. For real this time.