more color fixes
Merge pull request #575 from mikeshulman/master

more color fixes