scaffolding edited, colorpicker fixed

scaffolding edited, colorpicker fixed