Add new demo themes
Refactor out pageCollectionGenerator object