Merge pull request #1 from iwillspeak/master

Move Themes to Deftheme Format
remove template