theme page handling
Merge pull request #53 from sbillard/master

theme page handling