Fixed crash after renaming themes to theme
rearranged mustache and css
Merge pull request #209 from Sereri/master

Bug fix and new mustache/css