move colorpicker changes to build