Make colorpicker differently terrible.
Merge pull request #1480 from NatTuck/color-picker

Make colorpicker differently terrible.