Add support for colorpicker type
Merge pull request #2008 from kevinSuttle/colorpickers