Fixed numerous issues with the themes
Merge pull request #65 from pjackson28/fixthemes

Fixed numerous issues with the themes