Theme preview fixes.
Merge pull request #1693 from phaidon/theme-module-fix

Theme preview fixes.