First stab at color consolidation
Another one.
Whitespace