Removed hack from ColorPicker class