added color chooser
merge