Moved all of the color picker logic into the ColorPickerController
Cleanup from feature merge. Removed redundant properties and imports.