Fix a few more background-color settings
File cleanup/make more readable