Add Color Switch
Add Color Switch
Add Color Switch

Change order
Merge pull request #2824 from blopker/master

Add Color Switch