Check for theme existence correctly

The logic here was messy, so reworked to be a bit cleaner.
Merge pull request #64 from Chassis/rework-config-logic

Check for theme existence correctly