Some ColorPicker improvements