colorpicker refactor