color picker update
colorpicker merge++