Refactor ColorPicker ViewControllers