Colorpicker & scaffolding fixed