Added a color picker
Merged UColorPicker