Fixes #283. Fix for issue around Switching Themes