Fix up Themes conflict
Merge pull request #1 from timpohladthomas/patch-1

Fix up Themes conflict