brute force fixes
Merge pull request #341 from patriot1burke/master

brute force fixes
Added support for common resources to themes
Merge pull request #342 from stianst/master

Added support for common resources to themes