Rm CustomColorChooser, add Cancel to ColorChooser

Formatting changes,

Removed unnecessary listener