Fix error when theme config is missing
Merge branch 'themes'