click-to-save color swatches, parse colorscheme even without whitespace
Merge branch 'master' into gh-pages