Theming cleanup
Merge pull request #25 from timhobert/theming-cleanup

Theming cleanup