simplifying and segmenting color variables
Merge pull request #2313 from awesomerobot/master

simplifying and segmenting color variables