color chooser logic
Merge branch 'logic' into develop