diff --git a/src/Umbraco.Cms.StaticAssets/umbraco/UmbracoBackOffice/Default.cshtml b/src/Umbraco.Cms.StaticAssets/umbraco/UmbracoBackOffice/Default.cshtml
index 7282aa1dcc..3839bc2872 100644
--- a/src/Umbraco.Cms.StaticAssets/umbraco/UmbracoBackOffice/Default.cshtml
+++ b/src/Umbraco.Cms.StaticAssets/umbraco/UmbracoBackOffice/Default.cshtml
@@ -13,7 +13,6 @@
     <script type="importmap">
         {
             "imports": {
-                "@@umbraco-cms/backoffice/backend-api": "/umbraco/backoffice/external/backend-api/index.js",
                 "@@umbraco-cms/backoffice/external/uui": "/umbraco/backoffice/external/uui/index.js",
                 "@@umbraco-cms/backoffice/external/lit": "/umbraco/backoffice/external/lit/index.js",
                 "@@umbraco-cms/backoffice/external/openid": "/umbraco/backoffice/external/openid/index.js",
@@ -23,19 +22,23 @@
                 "@@umbraco-cms/backoffice/external/lodash": "/umbraco/backoffice/external/lodash/index.js",
                 "@@umbraco-cms/backoffice/external/monaco-editor": "/umbraco/backoffice/external/monaco-editor/index.js",
 
+                "@@umbraco-cms/backoffice/backend-api": "/umbraco/backoffice/external/backend-api/index.js",
                 "@@umbraco-cms/backoffice/context-api": "/umbraco/backoffice/libs/context-api/index.js",
                 "@@umbraco-cms/backoffice/controller-api": "/umbraco/backoffice/libs/controller-api/index.js",
                 "@@umbraco-cms/backoffice/element-api": "/umbraco/backoffice/libs/element-api/index.js",
                 "@@umbraco-cms/backoffice/extension-api": "/umbraco/backoffice/libs/extension-api/index.js",
                 "@@umbraco-cms/backoffice/observable-api": "/umbraco/backoffice/libs/observable-api/index.js",
 
+                "@@umbraco-cms/backoffice/auth": "/umbraco/backoffice/shared/auth/index.js",
+                "@@umbraco-cms/backoffice/context": "/umbraco/backoffice/shared/context/index.js",
                 "@@umbraco-cms/backoffice/events": "/umbraco/backoffice/shared/umb-events/index.js",
+                "@@umbraco-cms/backoffice/icon": "/umbraco/backoffice/shared/icon-registry/index.js",
                 "@@umbraco-cms/backoffice/models": "/umbraco/backoffice/shared/models/index.js",
                 "@@umbraco-cms/backoffice/repository": "/umbraco/backoffice/shared/repository/index.js",
                 "@@umbraco-cms/backoffice/resources": "/umbraco/backoffice/shared/resources/index.js",
                 "@@umbraco-cms/backoffice/router": "/umbraco/backoffice/shared/router/index.js",
                 "@@umbraco-cms/backoffice/utils": "/umbraco/backoffice/shared/utils/index.js",
-                "@@umbraco-cms/backoffice/icon": "/umbraco/backoffice/shared/icon-registry/index.js",
+
                 "@@umbraco-cms/internal/lit-element": "/umbraco/backoffice/shared/lit-element/index.js",
                 "@@umbraco-cms/internal/modal": "/umbraco/backoffice/shared/modal/index.js",
 
@@ -61,9 +64,23 @@
                 "@@umbraco-cms/backoffice/property-editor": "/umbraco/backoffice/packages/core/property-editor/index.js",
 
                 "@@umbraco-cms/backoffice/document": "/umbraco/backoffice/packages/documents/documents/index.js",
+				"@@umbraco-cms/backoffice/document-blueprint": "/umbraco/backoffice/packages/documents/document-blueprints/index.js",
+				"@@umbraco-cms/backoffice/document-type": "/umbraco/backoffice/packages/documents/document-types/index.js",
+				"@@umbraco-cms/backoffice/media": "/umbraco/backoffice/packages/media/media/index.js",
+				"@@umbraco-cms/backoffice/media-type": "/umbraco/backoffice/packages/media/media-types/index.js",
+				"@@umbraco-cms/backoffice/member": "/umbraco/backoffice/packages/members/members/index.js",
+				"@@umbraco-cms/backoffice/member-group": "/umbraco/backoffice/packages/members/member-groups/index.js",
+				"@@umbraco-cms/backoffice/member-type": "/umbraco/backoffice/packages/members/member-types/index.js",
+				"@@umbraco-cms/backoffice/package": "/umbraco/backoffice/packages/packages/package/index.js",
 
                 "@@umbraco-cms/backoffice/data-type": "/umbraco/backoffice/packages/settings/data-types/index.js",
+				"@@umbraco-cms/backoffice/language": "/umbraco/backoffice/packages/settings/languages/index.js",
+				"@@umbraco-cms/backoffice/relation-type": "/umbraco/backoffice/packages/settings/relation-types/index.js",
 				"@@umbraco-cms/backoffice/themes": "/umbraco/backoffice/packages/settings/themes/index.js",
+				"@@umbraco-cms/backoffice/tags": "/umbraco/backoffice/packages/tags/index.js",
+				"@@umbraco-cms/backoffice/partial-view": "/umbraco/backoffice/packages/templating/partial-views/index.js",
+				"@@umbraco-cms/backoffice/stylesheet": "/umbraco/backoffice/packages/templating/stylesheets/index.js",
+				"@@umbraco-cms/backoffice/template": "/umbraco/backoffice/packages/templating/templates/index.js",
 
 				"@@umbraco-cms/backoffice/user-group": "/umbraco/backoffice/packages/users/user-groups/index.js",
 				"@@umbraco-cms/backoffice/current-user": "/umbraco/backoffice/packages/users/current-user/index.js",
diff --git a/src/Umbraco.Cms.StaticAssets/umbraco/UmbracoInstall/Index.cshtml b/src/Umbraco.Cms.StaticAssets/umbraco/UmbracoInstall/Index.cshtml
index 7282aa1dcc..3839bc2872 100644
--- a/src/Umbraco.Cms.StaticAssets/umbraco/UmbracoInstall/Index.cshtml
+++ b/src/Umbraco.Cms.StaticAssets/umbraco/UmbracoInstall/Index.cshtml
@@ -13,7 +13,6 @@
     <script type="importmap">
         {
             "imports": {
-                "@@umbraco-cms/backoffice/backend-api": "/umbraco/backoffice/external/backend-api/index.js",
                 "@@umbraco-cms/backoffice/external/uui": "/umbraco/backoffice/external/uui/index.js",
                 "@@umbraco-cms/backoffice/external/lit": "/umbraco/backoffice/external/lit/index.js",
                 "@@umbraco-cms/backoffice/external/openid": "/umbraco/backoffice/external/openid/index.js",
@@ -23,19 +22,23 @@
                 "@@umbraco-cms/backoffice/external/lodash": "/umbraco/backoffice/external/lodash/index.js",
                 "@@umbraco-cms/backoffice/external/monaco-editor": "/umbraco/backoffice/external/monaco-editor/index.js",
 
+                "@@umbraco-cms/backoffice/backend-api": "/umbraco/backoffice/external/backend-api/index.js",
                 "@@umbraco-cms/backoffice/context-api": "/umbraco/backoffice/libs/context-api/index.js",
                 "@@umbraco-cms/backoffice/controller-api": "/umbraco/backoffice/libs/controller-api/index.js",
                 "@@umbraco-cms/backoffice/element-api": "/umbraco/backoffice/libs/element-api/index.js",
                 "@@umbraco-cms/backoffice/extension-api": "/umbraco/backoffice/libs/extension-api/index.js",
                 "@@umbraco-cms/backoffice/observable-api": "/umbraco/backoffice/libs/observable-api/index.js",
 
+                "@@umbraco-cms/backoffice/auth": "/umbraco/backoffice/shared/auth/index.js",
+                "@@umbraco-cms/backoffice/context": "/umbraco/backoffice/shared/context/index.js",
                 "@@umbraco-cms/backoffice/events": "/umbraco/backoffice/shared/umb-events/index.js",
+                "@@umbraco-cms/backoffice/icon": "/umbraco/backoffice/shared/icon-registry/index.js",
                 "@@umbraco-cms/backoffice/models": "/umbraco/backoffice/shared/models/index.js",
                 "@@umbraco-cms/backoffice/repository": "/umbraco/backoffice/shared/repository/index.js",
                 "@@umbraco-cms/backoffice/resources": "/umbraco/backoffice/shared/resources/index.js",
                 "@@umbraco-cms/backoffice/router": "/umbraco/backoffice/shared/router/index.js",
                 "@@umbraco-cms/backoffice/utils": "/umbraco/backoffice/shared/utils/index.js",
-                "@@umbraco-cms/backoffice/icon": "/umbraco/backoffice/shared/icon-registry/index.js",
+
                 "@@umbraco-cms/internal/lit-element": "/umbraco/backoffice/shared/lit-element/index.js",
                 "@@umbraco-cms/internal/modal": "/umbraco/backoffice/shared/modal/index.js",
 
@@ -61,9 +64,23 @@
                 "@@umbraco-cms/backoffice/property-editor": "/umbraco/backoffice/packages/core/property-editor/index.js",
 
                 "@@umbraco-cms/backoffice/document": "/umbraco/backoffice/packages/documents/documents/index.js",
+				"@@umbraco-cms/backoffice/document-blueprint": "/umbraco/backoffice/packages/documents/document-blueprints/index.js",
+				"@@umbraco-cms/backoffice/document-type": "/umbraco/backoffice/packages/documents/document-types/index.js",
+				"@@umbraco-cms/backoffice/media": "/umbraco/backoffice/packages/media/media/index.js",
+				"@@umbraco-cms/backoffice/media-type": "/umbraco/backoffice/packages/media/media-types/index.js",
+				"@@umbraco-cms/backoffice/member": "/umbraco/backoffice/packages/members/members/index.js",
+				"@@umbraco-cms/backoffice/member-group": "/umbraco/backoffice/packages/members/member-groups/index.js",
+				"@@umbraco-cms/backoffice/member-type": "/umbraco/backoffice/packages/members/member-types/index.js",
+				"@@umbraco-cms/backoffice/package": "/umbraco/backoffice/packages/packages/package/index.js",
 
                 "@@umbraco-cms/backoffice/data-type": "/umbraco/backoffice/packages/settings/data-types/index.js",
+				"@@umbraco-cms/backoffice/language": "/umbraco/backoffice/packages/settings/languages/index.js",
+				"@@umbraco-cms/backoffice/relation-type": "/umbraco/backoffice/packages/settings/relation-types/index.js",
 				"@@umbraco-cms/backoffice/themes": "/umbraco/backoffice/packages/settings/themes/index.js",
+				"@@umbraco-cms/backoffice/tags": "/umbraco/backoffice/packages/tags/index.js",
+				"@@umbraco-cms/backoffice/partial-view": "/umbraco/backoffice/packages/templating/partial-views/index.js",
+				"@@umbraco-cms/backoffice/stylesheet": "/umbraco/backoffice/packages/templating/stylesheets/index.js",
+				"@@umbraco-cms/backoffice/template": "/umbraco/backoffice/packages/templating/templates/index.js",
 
 				"@@umbraco-cms/backoffice/user-group": "/umbraco/backoffice/packages/users/user-groups/index.js",
 				"@@umbraco-cms/backoffice/current-user": "/umbraco/backoffice/packages/users/current-user/index.js",
diff --git a/src/Umbraco.Web.UI.New.Client b/src/Umbraco.Web.UI.New.Client
index 602f249625..20caa88a5b 160000
--- a/src/Umbraco.Web.UI.New.Client
+++ b/src/Umbraco.Web.UI.New.Client
@@ -1 +1 @@
-Subproject commit 602f24962540f78efbb3cd9556afa826cb3e37ca
+Subproject commit 20caa88a5b27549025ddc4d8f0bfa32629dc502c