Remove the ColorPicker
Use the AOSP Calender Color Picker and new Theme Settings Fragment