Merge pull request #268 from mgballard/master

Preliminary v2 theme