Uppgrade

colorpicker
padding
border