CAL-335 fix color picker