some color fixes, general consistency
Merge pull request #2319 from awesomerobot/master

some color fixes, general consistency