Make colour swatch clickable and fix its colour.
Merge branch 'master' into gh-pages