Fix colors and fonts on the circle
Merge branch 'master' into gh-pages