reorganised the color picker.