Add updated colorpicker and a couple of fixes