Changed some colours to blend better. Added some more classes.
Merge branch 'master' into gh-pages