Cleanup unused sections
Sync with default theme
White is white and that's how it should be