New styles. Better markup.
Merge branch 'master' into gh-pages