Fix ColorPicker