Updated ColorPicker