diff --git a/src/Umbraco.Web.UI.New.Client b/src/Umbraco.Web.UI.New.Client
index 739bd90cfe..b435296e85 160000
--- a/src/Umbraco.Web.UI.New.Client
+++ b/src/Umbraco.Web.UI.New.Client
@@ -1 +1 @@
-Subproject commit 739bd90cfee025e2fdad2411cfd19667b9a477bb
+Subproject commit b435296e852d9657c7daedfb1ffc5c2fdd7db4bd
diff --git a/src/Umbraco.Web.UI.New/umbraco/UmbracoBackOffice/Default.cshtml b/src/Umbraco.Web.UI.New/umbraco/UmbracoBackOffice/Default.cshtml
index 271647e0e1..6e93635c27 100644
--- a/src/Umbraco.Web.UI.New/umbraco/UmbracoBackOffice/Default.cshtml
+++ b/src/Umbraco.Web.UI.New/umbraco/UmbracoBackOffice/Default.cshtml
@@ -11,29 +11,31 @@
         {
             "imports": {
                 "@@umbraco-cms/backoffice/backend-api": "/umbraco/backoffice/libs/backend-api.js",
-                "@@umbraco-cms/backoffice/context-api": "/umbraco/backoffice/libs/context-api.js",
                 "@@umbraco-cms/backoffice/collection": "/umbraco/backoffice/libs/collection.js",
-                "@@umbraco-cms/backoffice/controller": "/umbraco/backoffice/libs/controller.js",
-                "@@umbraco-cms/backoffice/element": "/umbraco/backoffice/libs/element.js",
+                "@@umbraco-cms/backoffice/content-type": "/umbraco/backoffice/libs/content-type.js",
+                "@@umbraco-cms/backoffice/context-api": "/umbraco/backoffice/libs/context-api.js",
+                "@@umbraco-cms/backoffice/controller-api": "/umbraco/backoffice/libs/controller-api.js",
+                "@@umbraco-cms/backoffice/data-type": "/umbraco/backoffice/libs/data-type.js",
+                "@@umbraco-cms/backoffice/element-api": "/umbraco/backoffice/libs/element-api.js",
                 "@@umbraco-cms/backoffice/entity-action": "/umbraco/backoffice/libs/entity-action.js",
-                "@@umbraco-cms/backoffice/events": "/umbraco/backoffice/libs/umb-events.js",
-                "@@umbraco-cms/backoffice/extensions-api": "/umbraco/backoffice/libs/extensions-api.js",
-                "@@umbraco-cms/backoffice/extensions-registry": "/umbraco/backoffice/libs/extensions-registry.js",
+                "@@umbraco-cms/backoffice/extension-api": "/umbraco/backoffice/libs/extension-api.js",
+                "@@umbraco-cms/backoffice/extension-registry": "/umbraco/backoffice/libs/extension-registry.js",
                 "@@umbraco-cms/backoffice/id": "/umbraco/backoffice/libs/id.js",
                 "@@umbraco-cms/backoffice/modal": "/umbraco/backoffice/libs/modal.js",
                 "@@umbraco-cms/backoffice/models": "/umbraco/backoffice/libs/models.js",
                 "@@umbraco-cms/backoffice/notification": "/umbraco/backoffice/libs/notification.js",
                 "@@umbraco-cms/backoffice/observable-api": "/umbraco/backoffice/libs/observable-api.js",
                 "@@umbraco-cms/backoffice/picker-input": "/umbraco/backoffice/libs/picker-input.js",
-                "@@umbraco-cms/backoffice/property-editor": "/umbraco/backoffice/libs/property-editor.js",
                 "@@umbraco-cms/backoffice/repository": "/umbraco/backoffice/libs/repository.js",
                 "@@umbraco-cms/backoffice/resources": "/umbraco/backoffice/libs/resources.js",
                 "@@umbraco-cms/backoffice/router": "/umbraco/backoffice/libs/router.js",
                 "@@umbraco-cms/backoffice/section": "/umbraco/backoffice/libs/section.js",
+                "@@umbraco-cms/backoffice/sorter": "/umbraco/backoffice/libs/sorter.js",
                 "@@umbraco-cms/backoffice/store": "/umbraco/backoffice/libs/store.js",
                 "@@umbraco-cms/backoffice/tree": "/umbraco/backoffice/libs/tree.js",
-                "@@umbraco-cms/backoffice/variant": "/umbraco/backoffice/libs/variant.js",
+                "@@umbraco-cms/backoffice/events": "/umbraco/backoffice/libs/umb-events.js",
                 "@@umbraco-cms/backoffice/utils": "/umbraco/backoffice/libs/utils.js",
+                "@@umbraco-cms/backoffice/variant": "/umbraco/backoffice/libs/variant.js",
                 "@@umbraco-cms/backoffice/workspace": "/umbraco/backoffice/libs/workspace.js"
             }
         }
diff --git a/src/Umbraco.Web.UI.New/umbraco/UmbracoInstall/Index.cshtml b/src/Umbraco.Web.UI.New/umbraco/UmbracoInstall/Index.cshtml
index 271647e0e1..6e93635c27 100644
--- a/src/Umbraco.Web.UI.New/umbraco/UmbracoInstall/Index.cshtml
+++ b/src/Umbraco.Web.UI.New/umbraco/UmbracoInstall/Index.cshtml
@@ -11,29 +11,31 @@
         {
             "imports": {
                 "@@umbraco-cms/backoffice/backend-api": "/umbraco/backoffice/libs/backend-api.js",
-                "@@umbraco-cms/backoffice/context-api": "/umbraco/backoffice/libs/context-api.js",
                 "@@umbraco-cms/backoffice/collection": "/umbraco/backoffice/libs/collection.js",
-                "@@umbraco-cms/backoffice/controller": "/umbraco/backoffice/libs/controller.js",
-                "@@umbraco-cms/backoffice/element": "/umbraco/backoffice/libs/element.js",
+                "@@umbraco-cms/backoffice/content-type": "/umbraco/backoffice/libs/content-type.js",
+                "@@umbraco-cms/backoffice/context-api": "/umbraco/backoffice/libs/context-api.js",
+                "@@umbraco-cms/backoffice/controller-api": "/umbraco/backoffice/libs/controller-api.js",
+                "@@umbraco-cms/backoffice/data-type": "/umbraco/backoffice/libs/data-type.js",
+                "@@umbraco-cms/backoffice/element-api": "/umbraco/backoffice/libs/element-api.js",
                 "@@umbraco-cms/backoffice/entity-action": "/umbraco/backoffice/libs/entity-action.js",
-                "@@umbraco-cms/backoffice/events": "/umbraco/backoffice/libs/umb-events.js",
-                "@@umbraco-cms/backoffice/extensions-api": "/umbraco/backoffice/libs/extensions-api.js",
-                "@@umbraco-cms/backoffice/extensions-registry": "/umbraco/backoffice/libs/extensions-registry.js",
+                "@@umbraco-cms/backoffice/extension-api": "/umbraco/backoffice/libs/extension-api.js",
+                "@@umbraco-cms/backoffice/extension-registry": "/umbraco/backoffice/libs/extension-registry.js",
                 "@@umbraco-cms/backoffice/id": "/umbraco/backoffice/libs/id.js",
                 "@@umbraco-cms/backoffice/modal": "/umbraco/backoffice/libs/modal.js",
                 "@@umbraco-cms/backoffice/models": "/umbraco/backoffice/libs/models.js",
                 "@@umbraco-cms/backoffice/notification": "/umbraco/backoffice/libs/notification.js",
                 "@@umbraco-cms/backoffice/observable-api": "/umbraco/backoffice/libs/observable-api.js",
                 "@@umbraco-cms/backoffice/picker-input": "/umbraco/backoffice/libs/picker-input.js",
-                "@@umbraco-cms/backoffice/property-editor": "/umbraco/backoffice/libs/property-editor.js",
                 "@@umbraco-cms/backoffice/repository": "/umbraco/backoffice/libs/repository.js",
                 "@@umbraco-cms/backoffice/resources": "/umbraco/backoffice/libs/resources.js",
                 "@@umbraco-cms/backoffice/router": "/umbraco/backoffice/libs/router.js",
                 "@@umbraco-cms/backoffice/section": "/umbraco/backoffice/libs/section.js",
+                "@@umbraco-cms/backoffice/sorter": "/umbraco/backoffice/libs/sorter.js",
                 "@@umbraco-cms/backoffice/store": "/umbraco/backoffice/libs/store.js",
                 "@@umbraco-cms/backoffice/tree": "/umbraco/backoffice/libs/tree.js",
-                "@@umbraco-cms/backoffice/variant": "/umbraco/backoffice/libs/variant.js",
+                "@@umbraco-cms/backoffice/events": "/umbraco/backoffice/libs/umb-events.js",
                 "@@umbraco-cms/backoffice/utils": "/umbraco/backoffice/libs/utils.js",
+                "@@umbraco-cms/backoffice/variant": "/umbraco/backoffice/libs/variant.js",
                 "@@umbraco-cms/backoffice/workspace": "/umbraco/backoffice/libs/workspace.js"
             }
         }