Merge pull request #2315 from awesomerobot/master

a few small color fixes
Fix a bunch of color issues
few small consistency changes