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

Theme preview fixes.
Merge branch '1.4' of https://github.com/phaidon/core into 1.4