Segregated themes better
Merge pull request #78 from pjackson28/segregatethemesbetter

Segregated themes better