Consolidated theme submodules