allow empty string for theme
Merge branch 'themes'