added an explicit cache, further optimized colors
further optimization, colors fiffled with
Merge branch 'master' into gh-pages