Partial progress on Color Refactoring
Merge remote-tracking branch 'origin/master'