*added colorpicker
*fixed colorOptions