simplfying color palette, collecting colors into unified variables
Merge pull request #1924 from awesomerobot/master

simplfying color palette, collecting colors into unified variables