Colorpicker fixes