Rm CustomColorChooser, add Cancel to ColorChooser