added color selection to settings
merged add-color-picker