Merge pull request #574 from mikeshulman/master

color Types rather than types
Merge pull request #575 from mikeshulman/master

more color fixes