Comment background colors, set text color to whute
Merge branch 'master' into gh-pages