fix NPE in solr search
allow waltz and pony themes
Merge pull request #11 from hizel/waltz-pony

Waltz and Pony