-fixed colorpicker creation
-changed naming convention