Fixes #283. Fix for issue around Switching Themes
Merge pull request #284 from pencilblue/issue/PB283

Fixes #283. Fix for issue around Switching Themes