Fixed crash after renaming themes to theme
rearranged mustache and css