Better color selection
Finished color selection
Merge branch 'color-selection' into gh-pages