Changed colorpicker generation