Merge pull request #10 from yackle/develop

Add theme settings
Merge branch 'master' into develop