Theme fixes
Merge pull request #13 from sbillard/master

Theme fixes