Bootstrap related fixes for the theme module.
Merge pull request #1165 from phaidon/theme-module-fix

Bootstrap related fixes for the theme module.