Cleaning up a little bit + normalizing indentation
Improving some more colors previously overlooked