Modifications to theme module to support new D8 build.