Theme Bugfixes

Theme Bugfixes
Merge pull request #10 from favorspin/themefix

Theme Bugfixes