put colors back after transitioning
Merge branch 'master' into gh-pages