diff --git a/src/Umbraco.Web.UI.Client/src/core/backend-api/core/ApiError.ts b/src/Umbraco.Web.UI.Client/src/core/backend-api/core/ApiError.ts
index 1dfee0af35..99d7929967 100644
--- a/src/Umbraco.Web.UI.Client/src/core/backend-api/core/ApiError.ts
+++ b/src/Umbraco.Web.UI.Client/src/core/backend-api/core/ApiError.ts
@@ -5,20 +5,20 @@ import type { ApiRequestOptions } from './ApiRequestOptions';
 import type { ApiResult } from './ApiResult';
 
 export class ApiError extends Error {
-	public readonly url: string;
-	public readonly status: number;
-	public readonly statusText: string;
-	public readonly body: any;
-	public readonly request: ApiRequestOptions;
+    public readonly url: string;
+    public readonly status: number;
+    public readonly statusText: string;
+    public readonly body: any;
+    public readonly request: ApiRequestOptions;
 
-	constructor(request: ApiRequestOptions, response: ApiResult, message: string) {
-		super(message);
+    constructor(request: ApiRequestOptions, response: ApiResult, message: string) {
+        super(message);
 
-		this.name = 'ApiError';
-		this.url = response.url;
-		this.status = response.status;
-		this.statusText = response.statusText;
-		this.body = response.body;
-		this.request = request;
-	}
+        this.name = 'ApiError';
+        this.url = response.url;
+        this.status = response.status;
+        this.statusText = response.statusText;
+        this.body = response.body;
+        this.request = request;
+    }
 }
diff --git a/src/Umbraco.Web.UI.Client/src/core/backend-api/index.ts b/src/Umbraco.Web.UI.Client/src/core/backend-api/index.ts
index 6687aed063..7d1b97b143 100644
--- a/src/Umbraco.Web.UI.Client/src/core/backend-api/index.ts
+++ b/src/Umbraco.Web.UI.Client/src/core/backend-api/index.ts
@@ -26,6 +26,8 @@ export type { DatabaseSettings } from './models/DatabaseSettings';
 export type { DataType } from './models/DataType';
 export type { DataTypeCreateModel } from './models/DataTypeCreateModel';
 export type { DataTypeProperty } from './models/DataTypeProperty';
+export type { DataTypePropertyReference } from './models/DataTypePropertyReference';
+export type { DataTypeReference } from './models/DataTypeReference';
 export type { DataTypeUpdateModel } from './models/DataTypeUpdateModel';
 export type { Dictionary } from './models/Dictionary';
 export type { DictionaryImport } from './models/DictionaryImport';
@@ -44,7 +46,10 @@ export type { Field } from './models/Field';
 export { FieldAttributes } from './models/FieldAttributes';
 export type { FieldInfo } from './models/FieldInfo';
 export type { FileSystemTreeItem } from './models/FileSystemTreeItem';
+export type { Folder } from './models/Folder';
+export type { FolderCreateModel } from './models/FolderCreateModel';
 export type { FolderTreeItem } from './models/FolderTreeItem';
+export type { FolderUpdateModel } from './models/FolderUpdateModel';
 export { GenericParameterAttributes } from './models/GenericParameterAttributes';
 export type { HealthCheck } from './models/HealthCheck';
 export type { HealthCheckAction } from './models/HealthCheckAction';
@@ -52,6 +57,7 @@ export type { HealthCheckGroup } from './models/HealthCheckGroup';
 export type { HealthCheckGroupWithResult } from './models/HealthCheckGroupWithResult';
 export type { HealthCheckResult } from './models/HealthCheckResult';
 export type { HealthCheckWithResult } from './models/HealthCheckWithResult';
+export { HealthStatus } from './models/HealthStatus';
 export type { HelpPage } from './models/HelpPage';
 export type { ICustomAttributeProvider } from './models/ICustomAttributeProvider';
 export type { Index } from './models/Index';
@@ -75,6 +81,7 @@ export type { ModuleHandle } from './models/ModuleHandle';
 export type { NotFoundResult } from './models/NotFoundResult';
 export { NotificationStyle } from './models/NotificationStyle';
 export type { OkResult } from './models/OkResult';
+export { Operator } from './models/Operator';
 export type { OutOfDateStatus } from './models/OutOfDateStatus';
 export { OutOfDateType } from './models/OutOfDateType';
 export type { PagedContentTreeItem } from './models/PagedContentTreeItem';
@@ -121,6 +128,19 @@ export { StatusResultType } from './models/StatusResultType';
 export type { StructLayoutAttribute } from './models/StructLayoutAttribute';
 export type { Telemetry } from './models/Telemetry';
 export { TelemetryLevel } from './models/TelemetryLevel';
+export type { Template } from './models/Template';
+export type { TemplateCreateModel } from './models/TemplateCreateModel';
+export type { TemplateQueryExecuteFilterModel } from './models/TemplateQueryExecuteFilterModel';
+export type { TemplateQueryExecuteModel } from './models/TemplateQueryExecuteModel';
+export type { TemplateQueryExecuteSortModel } from './models/TemplateQueryExecuteSortModel';
+export type { TemplateQueryOperator } from './models/TemplateQueryOperator';
+export type { TemplateQueryProperty } from './models/TemplateQueryProperty';
+export { TemplateQueryPropertyType } from './models/TemplateQueryPropertyType';
+export type { TemplateQueryResult } from './models/TemplateQueryResult';
+export type { TemplateQueryResultItem } from './models/TemplateQueryResultItem';
+export type { TemplateQuerySettings } from './models/TemplateQuerySettings';
+export type { TemplateScaffold } from './models/TemplateScaffold';
+export type { TemplateUpdateModel } from './models/TemplateUpdateModel';
 export type { Type } from './models/Type';
 export { TypeAttributes } from './models/TypeAttributes';
 export type { TypeInfo } from './models/TypeInfo';
diff --git a/src/Umbraco.Web.UI.Client/src/core/backend-api/models/Assembly.ts b/src/Umbraco.Web.UI.Client/src/core/backend-api/models/Assembly.ts
index 13d126ea17..188ab7ecbe 100644
--- a/src/Umbraco.Web.UI.Client/src/core/backend-api/models/Assembly.ts
+++ b/src/Umbraco.Web.UI.Client/src/core/backend-api/models/Assembly.ts
@@ -10,27 +10,27 @@ import type { Type } from './Type';
 import type { TypeInfo } from './TypeInfo';
 
 export type Assembly = {
-    readonly definedTypes?: Array<TypeInfo> | null;
-    readonly exportedTypes?: Array<Type> | null;
+    readonly definedTypes?: Array<TypeInfo>;
+    readonly exportedTypes?: Array<Type>;
     /**
      * @deprecated
      */
     readonly codeBase?: string | null;
     entryPoint?: MethodInfo;
     readonly fullName?: string | null;
-    readonly imageRuntimeVersion?: string | null;
+    readonly imageRuntimeVersion?: string;
     readonly isDynamic?: boolean;
-    readonly location?: string | null;
+    readonly location?: string;
     readonly reflectionOnly?: boolean;
     readonly isCollectible?: boolean;
     readonly isFullyTrusted?: boolean;
-    readonly customAttributes?: Array<CustomAttributeData> | null;
+    readonly customAttributes?: Array<CustomAttributeData>;
     /**
      * @deprecated
      */
-    readonly escapedCodeBase?: string | null;
+    readonly escapedCodeBase?: string;
     manifestModule?: Module;
-    readonly modules?: Array<Module> | null;
+    readonly modules?: Array<Module>;
     /**
      * @deprecated
      */
diff --git a/src/Umbraco.Web.UI.Client/src/core/backend-api/models/ConsentLevel.ts b/src/Umbraco.Web.UI.Client/src/core/backend-api/models/ConsentLevel.ts
index 155a1b210e..d581eed573 100644
--- a/src/Umbraco.Web.UI.Client/src/core/backend-api/models/ConsentLevel.ts
+++ b/src/Umbraco.Web.UI.Client/src/core/backend-api/models/ConsentLevel.ts
@@ -6,6 +6,6 @@ import type { TelemetryLevel } from './TelemetryLevel';
 
 export type ConsentLevel = {
     level?: TelemetryLevel;
-    description?: string | null;
+    description?: string;
 };
 
diff --git a/src/Umbraco.Web.UI.Client/src/core/backend-api/models/ConstructorInfo.ts b/src/Umbraco.Web.UI.Client/src/core/backend-api/models/ConstructorInfo.ts
index d8fcf5ff11..bc87002c57 100644
--- a/src/Umbraco.Web.UI.Client/src/core/backend-api/models/ConstructorInfo.ts
+++ b/src/Umbraco.Web.UI.Client/src/core/backend-api/models/ConstructorInfo.ts
@@ -12,11 +12,11 @@ import type { RuntimeMethodHandle } from './RuntimeMethodHandle';
 import type { Type } from './Type';
 
 export type ConstructorInfo = {
-    readonly name?: string | null;
+    readonly name?: string;
     declaringType?: Type;
     reflectedType?: Type;
     module?: Module;
-    readonly customAttributes?: Array<CustomAttributeData> | null;
+    readonly customAttributes?: Array<CustomAttributeData>;
     readonly isCollectible?: boolean;
     readonly metadataToken?: number;
     attributes?: MethodAttributes;
diff --git a/src/Umbraco.Web.UI.Client/src/core/backend-api/models/ContentTreeItem.ts b/src/Umbraco.Web.UI.Client/src/core/backend-api/models/ContentTreeItem.ts
index 8cafbf1308..6f7ad5f2bf 100644
--- a/src/Umbraco.Web.UI.Client/src/core/backend-api/models/ContentTreeItem.ts
+++ b/src/Umbraco.Web.UI.Client/src/core/backend-api/models/ContentTreeItem.ts
@@ -3,13 +3,14 @@
 /* eslint-disable */
 
 export type ContentTreeItem = {
-    name?: string | null;
-    type?: string | null;
-    icon?: string | null;
+    name?: string;
+    type?: string;
+    icon?: string;
     hasChildren?: boolean;
     key?: string;
     isContainer?: boolean;
     parentKey?: string | null;
     noAccess?: boolean;
+    isTrashed?: boolean;
 };
 
diff --git a/src/Umbraco.Web.UI.Client/src/core/backend-api/models/CreatedResult.ts b/src/Umbraco.Web.UI.Client/src/core/backend-api/models/CreatedResult.ts
index 8f0739f88f..0b19517af2 100644
--- a/src/Umbraco.Web.UI.Client/src/core/backend-api/models/CreatedResult.ts
+++ b/src/Umbraco.Web.UI.Client/src/core/backend-api/models/CreatedResult.ts
@@ -7,10 +7,10 @@ import type { Type } from './Type';
 
 export type CreatedResult = {
     value?: any;
-    formatters?: Array<IOutputFormatter> | null;
-    contentTypes?: Array<string> | null;
+    formatters?: Array<IOutputFormatter>;
+    contentTypes?: Array<string>;
     declaredType?: Type;
     statusCode?: number | null;
-    location?: string | null;
+    location?: string;
 };
 
diff --git a/src/Umbraco.Web.UI.Client/src/core/backend-api/models/Culture.ts b/src/Umbraco.Web.UI.Client/src/core/backend-api/models/Culture.ts
index f8b6bb184b..15f63f8740 100644
--- a/src/Umbraco.Web.UI.Client/src/core/backend-api/models/Culture.ts
+++ b/src/Umbraco.Web.UI.Client/src/core/backend-api/models/Culture.ts
@@ -3,7 +3,7 @@
 /* eslint-disable */
 
 export type Culture = {
-    name?: string | null;
-    englishName?: string | null;
+    name?: string;
+    englishName?: string;
 };
 
diff --git a/src/Umbraco.Web.UI.Client/src/core/backend-api/models/CustomAttributeData.ts b/src/Umbraco.Web.UI.Client/src/core/backend-api/models/CustomAttributeData.ts
index c91d2b383d..c16e0f1c0a 100644
--- a/src/Umbraco.Web.UI.Client/src/core/backend-api/models/CustomAttributeData.ts
+++ b/src/Umbraco.Web.UI.Client/src/core/backend-api/models/CustomAttributeData.ts
@@ -10,7 +10,7 @@ import type { Type } from './Type';
 export type CustomAttributeData = {
     attributeType?: Type;
     constructor?: ConstructorInfo;
-    readonly constructorArguments?: Array<CustomAttributeTypedArgument> | null;
-    readonly namedArguments?: Array<CustomAttributeNamedArgument> | null;
+    readonly constructorArguments?: Array<CustomAttributeTypedArgument>;
+    readonly namedArguments?: Array<CustomAttributeNamedArgument>;
 };
 
diff --git a/src/Umbraco.Web.UI.Client/src/core/backend-api/models/CustomAttributeNamedArgument.ts b/src/Umbraco.Web.UI.Client/src/core/backend-api/models/CustomAttributeNamedArgument.ts
index 0985714283..cf176a6832 100644
--- a/src/Umbraco.Web.UI.Client/src/core/backend-api/models/CustomAttributeNamedArgument.ts
+++ b/src/Umbraco.Web.UI.Client/src/core/backend-api/models/CustomAttributeNamedArgument.ts
@@ -8,7 +8,7 @@ import type { MemberInfo } from './MemberInfo';
 export type CustomAttributeNamedArgument = {
     memberInfo?: MemberInfo;
     typedValue?: CustomAttributeTypedArgument;
-    readonly memberName?: string | null;
+    readonly memberName?: string;
     readonly isField?: boolean;
 };
 
diff --git a/src/Umbraco.Web.UI.Client/src/core/backend-api/models/DataType.ts b/src/Umbraco.Web.UI.Client/src/core/backend-api/models/DataType.ts
index 4476e50e7b..951f65e274 100644
--- a/src/Umbraco.Web.UI.Client/src/core/backend-api/models/DataType.ts
+++ b/src/Umbraco.Web.UI.Client/src/core/backend-api/models/DataType.ts
@@ -5,9 +5,10 @@
 import type { DataTypeProperty } from './DataTypeProperty';
 
 export type DataType = {
-    name?: string | null;
-    propertyEditorAlias?: string | null;
-    data?: Array<DataTypeProperty> | null;
+    name?: string;
+    propertyEditorAlias?: string;
+    propertyEditorUiAlias?: string | null;
+    data?: Array<DataTypeProperty>;
     key?: string;
     parentKey?: string | null;
 };
diff --git a/src/Umbraco.Web.UI.Client/src/core/backend-api/models/DataTypeCreateModel.ts b/src/Umbraco.Web.UI.Client/src/core/backend-api/models/DataTypeCreateModel.ts
index 18592412d1..bdceaf80cb 100644
--- a/src/Umbraco.Web.UI.Client/src/core/backend-api/models/DataTypeCreateModel.ts
+++ b/src/Umbraco.Web.UI.Client/src/core/backend-api/models/DataTypeCreateModel.ts
@@ -5,9 +5,10 @@
 import type { DataTypeProperty } from './DataTypeProperty';
 
 export type DataTypeCreateModel = {
-    name?: string | null;
-    propertyEditorAlias?: string | null;
-    data?: Array<DataTypeProperty> | null;
+    name?: string;
+    propertyEditorAlias?: string;
+    propertyEditorUiAlias?: string | null;
+    data?: Array<DataTypeProperty>;
     parentKey?: string | null;
 };
 
diff --git a/src/Umbraco.Web.UI.Client/src/core/backend-api/models/DataTypeProperty.ts b/src/Umbraco.Web.UI.Client/src/core/backend-api/models/DataTypeProperty.ts
index d069cab255..75031fa9af 100644
--- a/src/Umbraco.Web.UI.Client/src/core/backend-api/models/DataTypeProperty.ts
+++ b/src/Umbraco.Web.UI.Client/src/core/backend-api/models/DataTypeProperty.ts
@@ -3,7 +3,7 @@
 /* eslint-disable */
 
 export type DataTypeProperty = {
-    alias?: string | null;
+    alias?: string;
     value?: any;
 };
 
diff --git a/src/Umbraco.Web.UI.Client/src/core/backend-api/models/DataTypePropertyReference.ts b/src/Umbraco.Web.UI.Client/src/core/backend-api/models/DataTypePropertyReference.ts
new file mode 100644
index 0000000000..07bf4500db
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/core/backend-api/models/DataTypePropertyReference.ts
@@ -0,0 +1,9 @@
+/* istanbul ignore file */
+/* tslint:disable */
+/* eslint-disable */
+
+export type DataTypePropertyReference = {
+    name?: string;
+    alias?: string;
+};
+
diff --git a/src/Umbraco.Web.UI.Client/src/core/backend-api/models/DataTypeReference.ts b/src/Umbraco.Web.UI.Client/src/core/backend-api/models/DataTypeReference.ts
new file mode 100644
index 0000000000..b1c0c02770
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/core/backend-api/models/DataTypeReference.ts
@@ -0,0 +1,12 @@
+/* istanbul ignore file */
+/* tslint:disable */
+/* eslint-disable */
+
+import type { DataTypePropertyReference } from './DataTypePropertyReference';
+
+export type DataTypeReference = {
+    key?: string;
+    type?: string;
+    properties?: Array<DataTypePropertyReference>;
+};
+
diff --git a/src/Umbraco.Web.UI.Client/src/core/backend-api/models/DataTypeUpdateModel.ts b/src/Umbraco.Web.UI.Client/src/core/backend-api/models/DataTypeUpdateModel.ts
index 95f65138f5..f264cdf90b 100644
--- a/src/Umbraco.Web.UI.Client/src/core/backend-api/models/DataTypeUpdateModel.ts
+++ b/src/Umbraco.Web.UI.Client/src/core/backend-api/models/DataTypeUpdateModel.ts
@@ -5,8 +5,9 @@
 import type { DataTypeProperty } from './DataTypeProperty';
 
 export type DataTypeUpdateModel = {
-    name?: string | null;
-    propertyEditorAlias?: string | null;
-    data?: Array<DataTypeProperty> | null;
+    name?: string;
+    propertyEditorAlias?: string;
+    propertyEditorUiAlias?: string | null;
+    data?: Array<DataTypeProperty>;
 };
 
diff --git a/src/Umbraco.Web.UI.Client/src/core/backend-api/models/DatabaseSettings.ts b/src/Umbraco.Web.UI.Client/src/core/backend-api/models/DatabaseSettings.ts
index fa99b51d1f..ccaa1ff21c 100644
--- a/src/Umbraco.Web.UI.Client/src/core/backend-api/models/DatabaseSettings.ts
+++ b/src/Umbraco.Web.UI.Client/src/core/backend-api/models/DatabaseSettings.ts
@@ -5,12 +5,12 @@
 export type DatabaseSettings = {
     id?: string;
     sortOrder?: number;
-    displayName?: string | null;
-    defaultDatabaseName?: string | null;
-    providerName?: string | null;
+    displayName?: string;
+    defaultDatabaseName?: string;
+    providerName?: string;
     isConfigured?: boolean;
     requiresServer?: boolean;
-    serverPlaceholder?: string | null;
+    serverPlaceholder?: string;
     requiresCredentials?: boolean;
     supportsIntegratedAuthentication?: boolean;
     requiresConnectionTest?: boolean;
diff --git a/src/Umbraco.Web.UI.Client/src/core/backend-api/models/Dictionary.ts b/src/Umbraco.Web.UI.Client/src/core/backend-api/models/Dictionary.ts
index 5464bde7b8..ae6139cb92 100644
--- a/src/Umbraco.Web.UI.Client/src/core/backend-api/models/Dictionary.ts
+++ b/src/Umbraco.Web.UI.Client/src/core/backend-api/models/Dictionary.ts
@@ -8,11 +8,11 @@ import type { DictionaryTranslation } from './DictionaryTranslation';
 
 export type Dictionary = {
     parentId?: string | null;
-    translations?: Array<DictionaryTranslation> | null;
-    contentApps?: Array<ContentApp> | null;
-    readonly notifications?: Array<BackOfficeNotification> | null;
+    translations?: Array<DictionaryTranslation>;
+    contentApps?: Array<ContentApp>;
+    readonly notifications?: Array<BackOfficeNotification>;
     name: string;
     key?: string;
-    path?: string | null;
+    path?: string;
 };
 
diff --git a/src/Umbraco.Web.UI.Client/src/core/backend-api/models/DictionaryImport.ts b/src/Umbraco.Web.UI.Client/src/core/backend-api/models/DictionaryImport.ts
index 9d4d282be0..400116fd57 100644
--- a/src/Umbraco.Web.UI.Client/src/core/backend-api/models/DictionaryImport.ts
+++ b/src/Umbraco.Web.UI.Client/src/core/backend-api/models/DictionaryImport.ts
@@ -5,7 +5,7 @@
 import type { DictionaryItemsImport } from './DictionaryItemsImport';
 
 export type DictionaryImport = {
-    dictionaryItems?: Array<DictionaryItemsImport> | null;
+    dictionaryItems?: Array<DictionaryItemsImport>;
     tempFileName?: string | null;
 };
 
diff --git a/src/Umbraco.Web.UI.Client/src/core/backend-api/models/DictionaryOverview.ts b/src/Umbraco.Web.UI.Client/src/core/backend-api/models/DictionaryOverview.ts
index 438c2bbc78..42d0015a0e 100644
--- a/src/Umbraco.Web.UI.Client/src/core/backend-api/models/DictionaryOverview.ts
+++ b/src/Umbraco.Web.UI.Client/src/core/backend-api/models/DictionaryOverview.ts
@@ -8,6 +8,6 @@ export type DictionaryOverview = {
     name?: string | null;
     key?: string;
     level?: number;
-    readonly translations?: Array<DictionaryTranslationOverview> | null;
+    readonly translations?: Array<DictionaryTranslationOverview>;
 };
 
diff --git a/src/Umbraco.Web.UI.Client/src/core/backend-api/models/DictionaryTranslation.ts b/src/Umbraco.Web.UI.Client/src/core/backend-api/models/DictionaryTranslation.ts
index 669e0a94cf..97f245a415 100644
--- a/src/Umbraco.Web.UI.Client/src/core/backend-api/models/DictionaryTranslation.ts
+++ b/src/Umbraco.Web.UI.Client/src/core/backend-api/models/DictionaryTranslation.ts
@@ -7,7 +7,7 @@ export type DictionaryTranslation = {
     key?: string;
     displayName?: string | null;
     isoCode?: string | null;
-    translation?: string | null;
+    translation?: string;
     languageId?: number;
 };
 
diff --git a/src/Umbraco.Web.UI.Client/src/core/backend-api/models/DocumentBlueprintTreeItem.ts b/src/Umbraco.Web.UI.Client/src/core/backend-api/models/DocumentBlueprintTreeItem.ts
index ef120659bd..95af2225f0 100644
--- a/src/Umbraco.Web.UI.Client/src/core/backend-api/models/DocumentBlueprintTreeItem.ts
+++ b/src/Umbraco.Web.UI.Client/src/core/backend-api/models/DocumentBlueprintTreeItem.ts
@@ -3,15 +3,15 @@
 /* eslint-disable */
 
 export type DocumentBlueprintTreeItem = {
-    name?: string | null;
-    type?: string | null;
-    icon?: string | null;
+    name?: string;
+    type?: string;
+    icon?: string;
     hasChildren?: boolean;
     key?: string;
     isContainer?: boolean;
     parentKey?: string | null;
     documentTypeKey?: string;
-    documentTypeAlias?: string | null;
+    documentTypeAlias?: string;
     documentTypeName?: string | null;
 };
 
diff --git a/src/Umbraco.Web.UI.Client/src/core/backend-api/models/DocumentTreeItem.ts b/src/Umbraco.Web.UI.Client/src/core/backend-api/models/DocumentTreeItem.ts
index 489cc15166..c3fda312be 100644
--- a/src/Umbraco.Web.UI.Client/src/core/backend-api/models/DocumentTreeItem.ts
+++ b/src/Umbraco.Web.UI.Client/src/core/backend-api/models/DocumentTreeItem.ts
@@ -3,14 +3,15 @@
 /* eslint-disable */
 
 export type DocumentTreeItem = {
-    name?: string | null;
-    type?: string | null;
-    icon?: string | null;
+    name?: string;
+    type?: string;
+    icon?: string;
     hasChildren?: boolean;
     key?: string;
     isContainer?: boolean;
     parentKey?: string | null;
     noAccess?: boolean;
+    isTrashed?: boolean;
     isProtected?: boolean;
     isPublished?: boolean;
     isEdited?: boolean;
diff --git a/src/Umbraco.Web.UI.Client/src/core/backend-api/models/DocumentTypeTreeItem.ts b/src/Umbraco.Web.UI.Client/src/core/backend-api/models/DocumentTypeTreeItem.ts
index 72bd8082d6..ffe110b4fc 100644
--- a/src/Umbraco.Web.UI.Client/src/core/backend-api/models/DocumentTypeTreeItem.ts
+++ b/src/Umbraco.Web.UI.Client/src/core/backend-api/models/DocumentTypeTreeItem.ts
@@ -3,9 +3,9 @@
 /* eslint-disable */
 
 export type DocumentTypeTreeItem = {
-    name?: string | null;
-    type?: string | null;
-    icon?: string | null;
+    name?: string;
+    type?: string;
+    icon?: string;
     hasChildren?: boolean;
     key?: string;
     isContainer?: boolean;
diff --git a/src/Umbraco.Web.UI.Client/src/core/backend-api/models/EntityTreeItem.ts b/src/Umbraco.Web.UI.Client/src/core/backend-api/models/EntityTreeItem.ts
index 77a5b9cda9..47c461934d 100644
--- a/src/Umbraco.Web.UI.Client/src/core/backend-api/models/EntityTreeItem.ts
+++ b/src/Umbraco.Web.UI.Client/src/core/backend-api/models/EntityTreeItem.ts
@@ -3,9 +3,9 @@
 /* eslint-disable */
 
 export type EntityTreeItem = {
-    name?: string | null;
-    type?: string | null;
-    icon?: string | null;
+    name?: string;
+    type?: string;
+    icon?: string;
     hasChildren?: boolean;
     key?: string;
     isContainer?: boolean;
diff --git a/src/Umbraco.Web.UI.Client/src/core/backend-api/models/EventInfo.ts b/src/Umbraco.Web.UI.Client/src/core/backend-api/models/EventInfo.ts
index 4ec49e7f1b..1f85186081 100644
--- a/src/Umbraco.Web.UI.Client/src/core/backend-api/models/EventInfo.ts
+++ b/src/Umbraco.Web.UI.Client/src/core/backend-api/models/EventInfo.ts
@@ -10,11 +10,11 @@ import type { Module } from './Module';
 import type { Type } from './Type';
 
 export type EventInfo = {
-    readonly name?: string | null;
+    readonly name?: string;
     declaringType?: Type;
     reflectedType?: Type;
     module?: Module;
-    readonly customAttributes?: Array<CustomAttributeData> | null;
+    readonly customAttributes?: Array<CustomAttributeData>;
     readonly isCollectible?: boolean;
     readonly metadataToken?: number;
     memberType?: MemberTypes;
diff --git a/src/Umbraco.Web.UI.Client/src/core/backend-api/models/Field.ts b/src/Umbraco.Web.UI.Client/src/core/backend-api/models/Field.ts
index f03083b81d..7bc3138a69 100644
--- a/src/Umbraco.Web.UI.Client/src/core/backend-api/models/Field.ts
+++ b/src/Umbraco.Web.UI.Client/src/core/backend-api/models/Field.ts
@@ -3,7 +3,7 @@
 /* eslint-disable */
 
 export type Field = {
-    name?: string | null;
-    values?: Array<string> | null;
+    name?: string;
+    values?: Array<string>;
 };
 
diff --git a/src/Umbraco.Web.UI.Client/src/core/backend-api/models/FieldInfo.ts b/src/Umbraco.Web.UI.Client/src/core/backend-api/models/FieldInfo.ts
index e54075e1a8..2a1bd213f0 100644
--- a/src/Umbraco.Web.UI.Client/src/core/backend-api/models/FieldInfo.ts
+++ b/src/Umbraco.Web.UI.Client/src/core/backend-api/models/FieldInfo.ts
@@ -10,11 +10,11 @@ import type { RuntimeFieldHandle } from './RuntimeFieldHandle';
 import type { Type } from './Type';
 
 export type FieldInfo = {
-    readonly name?: string | null;
+    readonly name?: string;
     declaringType?: Type;
     reflectedType?: Type;
     module?: Module;
-    readonly customAttributes?: Array<CustomAttributeData> | null;
+    readonly customAttributes?: Array<CustomAttributeData>;
     readonly isCollectible?: boolean;
     readonly metadataToken?: number;
     memberType?: MemberTypes;
diff --git a/src/Umbraco.Web.UI.Client/src/core/backend-api/models/FileSystemTreeItem.ts b/src/Umbraco.Web.UI.Client/src/core/backend-api/models/FileSystemTreeItem.ts
index 058f032a68..11fb5b5b07 100644
--- a/src/Umbraco.Web.UI.Client/src/core/backend-api/models/FileSystemTreeItem.ts
+++ b/src/Umbraco.Web.UI.Client/src/core/backend-api/models/FileSystemTreeItem.ts
@@ -3,11 +3,11 @@
 /* eslint-disable */
 
 export type FileSystemTreeItem = {
-    name?: string | null;
-    type?: string | null;
-    icon?: string | null;
+    name?: string;
+    type?: string;
+    icon?: string;
     hasChildren?: boolean;
-    path?: string | null;
+    path?: string;
     isFolder?: boolean;
 };
 
diff --git a/src/Umbraco.Web.UI.Client/src/core/backend-api/models/Folder.ts b/src/Umbraco.Web.UI.Client/src/core/backend-api/models/Folder.ts
new file mode 100644
index 0000000000..95565e60d8
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/core/backend-api/models/Folder.ts
@@ -0,0 +1,10 @@
+/* istanbul ignore file */
+/* tslint:disable */
+/* eslint-disable */
+
+export type Folder = {
+    name?: string;
+    key?: string;
+    parentKey?: string | null;
+};
+
diff --git a/src/Umbraco.Web.UI.Client/src/core/backend-api/models/FolderCreateModel.ts b/src/Umbraco.Web.UI.Client/src/core/backend-api/models/FolderCreateModel.ts
new file mode 100644
index 0000000000..fc34bb2ce8
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/core/backend-api/models/FolderCreateModel.ts
@@ -0,0 +1,9 @@
+/* istanbul ignore file */
+/* tslint:disable */
+/* eslint-disable */
+
+export type FolderCreateModel = {
+    name?: string;
+    parentKey?: string | null;
+};
+
diff --git a/src/Umbraco.Web.UI.Client/src/core/backend-api/models/FolderTreeItem.ts b/src/Umbraco.Web.UI.Client/src/core/backend-api/models/FolderTreeItem.ts
index 8407711e91..f3ca6a12e5 100644
--- a/src/Umbraco.Web.UI.Client/src/core/backend-api/models/FolderTreeItem.ts
+++ b/src/Umbraco.Web.UI.Client/src/core/backend-api/models/FolderTreeItem.ts
@@ -3,9 +3,9 @@
 /* eslint-disable */
 
 export type FolderTreeItem = {
-    name?: string | null;
-    type?: string | null;
-    icon?: string | null;
+    name?: string;
+    type?: string;
+    icon?: string;
     hasChildren?: boolean;
     key?: string;
     isContainer?: boolean;
diff --git a/src/Umbraco.Web.UI.Client/src/core/backend-api/models/FolderUpdateModel.ts b/src/Umbraco.Web.UI.Client/src/core/backend-api/models/FolderUpdateModel.ts
new file mode 100644
index 0000000000..8cf803666d
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/core/backend-api/models/FolderUpdateModel.ts
@@ -0,0 +1,8 @@
+/* istanbul ignore file */
+/* tslint:disable */
+/* eslint-disable */
+
+export type FolderUpdateModel = {
+    name?: string;
+};
+
diff --git a/src/Umbraco.Web.UI.Client/src/core/backend-api/models/HealthCheck.ts b/src/Umbraco.Web.UI.Client/src/core/backend-api/models/HealthCheck.ts
index bbd5d72496..c3a55c8fe2 100644
--- a/src/Umbraco.Web.UI.Client/src/core/backend-api/models/HealthCheck.ts
+++ b/src/Umbraco.Web.UI.Client/src/core/backend-api/models/HealthCheck.ts
@@ -4,7 +4,7 @@
 
 export type HealthCheck = {
     key?: string;
-    name?: string | null;
+    name?: string;
     description?: string | null;
 };
 
diff --git a/src/Umbraco.Web.UI.Client/src/core/backend-api/models/HealthCheckGroup.ts b/src/Umbraco.Web.UI.Client/src/core/backend-api/models/HealthCheckGroup.ts
index f96bad143e..f9cec322a2 100644
--- a/src/Umbraco.Web.UI.Client/src/core/backend-api/models/HealthCheckGroup.ts
+++ b/src/Umbraco.Web.UI.Client/src/core/backend-api/models/HealthCheckGroup.ts
@@ -6,6 +6,6 @@ import type { HealthCheck } from './HealthCheck';
 
 export type HealthCheckGroup = {
     name?: string | null;
-    checks?: Array<HealthCheck> | null;
+    checks?: Array<HealthCheck>;
 };
 
diff --git a/src/Umbraco.Web.UI.Client/src/core/backend-api/models/HealthCheckGroupWithResult.ts b/src/Umbraco.Web.UI.Client/src/core/backend-api/models/HealthCheckGroupWithResult.ts
index 797b13c46e..da13fe5aea 100644
--- a/src/Umbraco.Web.UI.Client/src/core/backend-api/models/HealthCheckGroupWithResult.ts
+++ b/src/Umbraco.Web.UI.Client/src/core/backend-api/models/HealthCheckGroupWithResult.ts
@@ -6,6 +6,6 @@ import type { HealthCheckWithResult } from './HealthCheckWithResult';
 
 export type HealthCheckGroupWithResult = {
     name?: string | null;
-    checks?: Array<HealthCheckWithResult> | null;
+    checks?: Array<HealthCheckWithResult>;
 };
 
diff --git a/src/Umbraco.Web.UI.Client/src/core/backend-api/models/HealthCheckResult.ts b/src/Umbraco.Web.UI.Client/src/core/backend-api/models/HealthCheckResult.ts
index 332200c5c4..24542f559c 100644
--- a/src/Umbraco.Web.UI.Client/src/core/backend-api/models/HealthCheckResult.ts
+++ b/src/Umbraco.Web.UI.Client/src/core/backend-api/models/HealthCheckResult.ts
@@ -6,7 +6,7 @@ import type { HealthCheckAction } from './HealthCheckAction';
 import type { StatusResultType } from './StatusResultType';
 
 export type HealthCheckResult = {
-    message?: string | null;
+    message?: string;
     resultType?: StatusResultType;
     actions?: Array<HealthCheckAction> | null;
     readMoreLink?: string | null;
diff --git a/src/Umbraco.Web.UI.Client/src/core/backend-api/models/HealthCheckWithResult.ts b/src/Umbraco.Web.UI.Client/src/core/backend-api/models/HealthCheckWithResult.ts
index 8001e4b7a5..31cb5d56e1 100644
--- a/src/Umbraco.Web.UI.Client/src/core/backend-api/models/HealthCheckWithResult.ts
+++ b/src/Umbraco.Web.UI.Client/src/core/backend-api/models/HealthCheckWithResult.ts
@@ -6,7 +6,7 @@ import type { HealthCheckResult } from './HealthCheckResult';
 
 export type HealthCheckWithResult = {
     key?: string;
-    name?: string | null;
+    name?: string;
     description?: string | null;
     results?: Array<HealthCheckResult> | null;
 };
diff --git a/src/Umbraco.Web.UI.Client/src/core/backend-api/models/HealthStatus.ts b/src/Umbraco.Web.UI.Client/src/core/backend-api/models/HealthStatus.ts
new file mode 100644
index 0000000000..4c4307a292
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/core/backend-api/models/HealthStatus.ts
@@ -0,0 +1,9 @@
+/* istanbul ignore file */
+/* tslint:disable */
+/* eslint-disable */
+
+export enum HealthStatus {
+    HEALTHY = 'Healthy',
+    UNHEALTHY = 'Unhealthy',
+    REBUILDING = 'Rebuilding',
+}
diff --git a/src/Umbraco.Web.UI.Client/src/core/backend-api/models/Index.ts b/src/Umbraco.Web.UI.Client/src/core/backend-api/models/Index.ts
index c34fc480b8..07f935b31e 100644
--- a/src/Umbraco.Web.UI.Client/src/core/backend-api/models/Index.ts
+++ b/src/Umbraco.Web.UI.Client/src/core/backend-api/models/Index.ts
@@ -2,12 +2,13 @@
 /* tslint:disable */
 /* eslint-disable */
 
+import type { HealthStatus } from './HealthStatus';
+
 export type Index = {
     name: string;
-    healthStatus?: string | null;
-    readonly isHealthy: boolean;
+    healthStatus?: HealthStatus;
     canRebuild: boolean;
-    searcherName?: string | null;
+    searcherName?: string;
     documentCount: number;
     fieldCount: number;
     providerProperties?: Record<string, any> | null;
diff --git a/src/Umbraco.Web.UI.Client/src/core/backend-api/models/InstallSettings.ts b/src/Umbraco.Web.UI.Client/src/core/backend-api/models/InstallSettings.ts
index 746fa1728a..334bbcdefd 100644
--- a/src/Umbraco.Web.UI.Client/src/core/backend-api/models/InstallSettings.ts
+++ b/src/Umbraco.Web.UI.Client/src/core/backend-api/models/InstallSettings.ts
@@ -7,6 +7,6 @@ import type { UserSettings } from './UserSettings';
 
 export type InstallSettings = {
     user?: UserSettings;
-    databases?: Array<DatabaseSettings> | null;
+    databases?: Array<DatabaseSettings>;
 };
 
diff --git a/src/Umbraco.Web.UI.Client/src/core/backend-api/models/JsonPatch.ts b/src/Umbraco.Web.UI.Client/src/core/backend-api/models/JsonPatch.ts
index e18637fcee..fb9e0177ba 100644
--- a/src/Umbraco.Web.UI.Client/src/core/backend-api/models/JsonPatch.ts
+++ b/src/Umbraco.Web.UI.Client/src/core/backend-api/models/JsonPatch.ts
@@ -3,8 +3,8 @@
 /* eslint-disable */
 
 export type JsonPatch = {
-    op?: string | null;
-    path?: string | null;
+    op?: string;
+    path?: string;
     value?: any;
 };
 
diff --git a/src/Umbraco.Web.UI.Client/src/core/backend-api/models/MemberInfo.ts b/src/Umbraco.Web.UI.Client/src/core/backend-api/models/MemberInfo.ts
index 3e3f9819c7..4b559a865e 100644
--- a/src/Umbraco.Web.UI.Client/src/core/backend-api/models/MemberInfo.ts
+++ b/src/Umbraco.Web.UI.Client/src/core/backend-api/models/MemberInfo.ts
@@ -9,11 +9,11 @@ import type { Type } from './Type';
 
 export type MemberInfo = {
     memberType?: MemberTypes;
-    readonly name?: string | null;
+    readonly name?: string;
     declaringType?: Type;
     reflectedType?: Type;
     module?: Module;
-    readonly customAttributes?: Array<CustomAttributeData> | null;
+    readonly customAttributes?: Array<CustomAttributeData>;
     readonly isCollectible?: boolean;
     readonly metadataToken?: number;
 };
diff --git a/src/Umbraco.Web.UI.Client/src/core/backend-api/models/MethodBase.ts b/src/Umbraco.Web.UI.Client/src/core/backend-api/models/MethodBase.ts
index 94cfa1b3cc..30167ffc4d 100644
--- a/src/Umbraco.Web.UI.Client/src/core/backend-api/models/MethodBase.ts
+++ b/src/Umbraco.Web.UI.Client/src/core/backend-api/models/MethodBase.ts
@@ -13,11 +13,11 @@ import type { Type } from './Type';
 
 export type MethodBase = {
     memberType?: MemberTypes;
-    readonly name?: string | null;
+    readonly name?: string;
     declaringType?: Type;
     reflectedType?: Type;
     module?: Module;
-    readonly customAttributes?: Array<CustomAttributeData> | null;
+    readonly customAttributes?: Array<CustomAttributeData>;
     readonly isCollectible?: boolean;
     readonly metadataToken?: number;
     attributes?: MethodAttributes;
diff --git a/src/Umbraco.Web.UI.Client/src/core/backend-api/models/MethodInfo.ts b/src/Umbraco.Web.UI.Client/src/core/backend-api/models/MethodInfo.ts
index 382fb5adf5..c1a3d421cd 100644
--- a/src/Umbraco.Web.UI.Client/src/core/backend-api/models/MethodInfo.ts
+++ b/src/Umbraco.Web.UI.Client/src/core/backend-api/models/MethodInfo.ts
@@ -14,11 +14,11 @@ import type { RuntimeMethodHandle } from './RuntimeMethodHandle';
 import type { Type } from './Type';
 
 export type MethodInfo = {
-    readonly name?: string | null;
+    readonly name?: string;
     declaringType?: Type;
     reflectedType?: Type;
     module?: Module;
-    readonly customAttributes?: Array<CustomAttributeData> | null;
+    readonly customAttributes?: Array<CustomAttributeData>;
     readonly isCollectible?: boolean;
     readonly metadataToken?: number;
     attributes?: MethodAttributes;
diff --git a/src/Umbraco.Web.UI.Client/src/core/backend-api/models/Module.ts b/src/Umbraco.Web.UI.Client/src/core/backend-api/models/Module.ts
index 7843f8da04..87a07e860a 100644
--- a/src/Umbraco.Web.UI.Client/src/core/backend-api/models/Module.ts
+++ b/src/Umbraco.Web.UI.Client/src/core/backend-api/models/Module.ts
@@ -8,13 +8,13 @@ import type { ModuleHandle } from './ModuleHandle';
 
 export type Module = {
     assembly?: Assembly;
-    readonly fullyQualifiedName?: string | null;
-    readonly name?: string | null;
+    readonly fullyQualifiedName?: string;
+    readonly name?: string;
     readonly mdStreamVersion?: number;
     readonly moduleVersionId?: string;
-    readonly scopeName?: string | null;
+    readonly scopeName?: string;
     moduleHandle?: ModuleHandle;
-    readonly customAttributes?: Array<CustomAttributeData> | null;
+    readonly customAttributes?: Array<CustomAttributeData>;
     readonly metadataToken?: number;
 };
 
diff --git a/src/Umbraco.Web.UI.Client/src/core/backend-api/models/Operator.ts b/src/Umbraco.Web.UI.Client/src/core/backend-api/models/Operator.ts
new file mode 100644
index 0000000000..7d4e681831
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/core/backend-api/models/Operator.ts
@@ -0,0 +1,14 @@
+/* istanbul ignore file */
+/* tslint:disable */
+/* eslint-disable */
+
+export enum Operator {
+    EQUALS = 'Equals',
+    NOT_EQUALS = 'NotEquals',
+    CONTAINS = 'Contains',
+    NOT_CONTAINS = 'NotContains',
+    LESS_THAN = 'LessThan',
+    LESS_THAN_EQUAL_TO = 'LessThanEqualTo',
+    GREATER_THAN = 'GreaterThan',
+    GREATER_THAN_EQUAL_TO = 'GreaterThanEqualTo',
+}
diff --git a/src/Umbraco.Web.UI.Client/src/core/backend-api/models/ParameterInfo.ts b/src/Umbraco.Web.UI.Client/src/core/backend-api/models/ParameterInfo.ts
index 15c13932a7..b83cfb909b 100644
--- a/src/Umbraco.Web.UI.Client/src/core/backend-api/models/ParameterInfo.ts
+++ b/src/Umbraco.Web.UI.Client/src/core/backend-api/models/ParameterInfo.ts
@@ -21,7 +21,7 @@ export type ParameterInfo = {
     readonly defaultValue?: any;
     readonly rawDefaultValue?: any;
     readonly hasDefaultValue?: boolean;
-    readonly customAttributes?: Array<CustomAttributeData> | null;
+    readonly customAttributes?: Array<CustomAttributeData>;
     readonly metadataToken?: number;
 };
 
diff --git a/src/Umbraco.Web.UI.Client/src/core/backend-api/models/PropertyInfo.ts b/src/Umbraco.Web.UI.Client/src/core/backend-api/models/PropertyInfo.ts
index df98f1e0c1..cc2b6cbfb3 100644
--- a/src/Umbraco.Web.UI.Client/src/core/backend-api/models/PropertyInfo.ts
+++ b/src/Umbraco.Web.UI.Client/src/core/backend-api/models/PropertyInfo.ts
@@ -10,11 +10,11 @@ import type { PropertyAttributes } from './PropertyAttributes';
 import type { Type } from './Type';
 
 export type PropertyInfo = {
-    readonly name?: string | null;
+    readonly name?: string;
     declaringType?: Type;
     reflectedType?: Type;
     module?: Module;
-    readonly customAttributes?: Array<CustomAttributeData> | null;
+    readonly customAttributes?: Array<CustomAttributeData>;
     readonly isCollectible?: boolean;
     readonly metadataToken?: number;
     memberType?: MemberTypes;
diff --git a/src/Umbraco.Web.UI.Client/src/core/backend-api/models/RecycleBinItem.ts b/src/Umbraco.Web.UI.Client/src/core/backend-api/models/RecycleBinItem.ts
index 6e077b49fd..726cf81eec 100644
--- a/src/Umbraco.Web.UI.Client/src/core/backend-api/models/RecycleBinItem.ts
+++ b/src/Umbraco.Web.UI.Client/src/core/backend-api/models/RecycleBinItem.ts
@@ -4,9 +4,9 @@
 
 export type RecycleBinItem = {
     key?: string;
-    name?: string | null;
-    type?: string | null;
-    icon?: string | null;
+    name?: string;
+    type?: string;
+    icon?: string;
     hasChildren?: boolean;
     isContainer?: boolean;
     parentKey?: string | null;
diff --git a/src/Umbraco.Web.UI.Client/src/core/backend-api/models/RedirectUrl.ts b/src/Umbraco.Web.UI.Client/src/core/backend-api/models/RedirectUrl.ts
index 7f7eaf0ddb..5c1fec3934 100644
--- a/src/Umbraco.Web.UI.Client/src/core/backend-api/models/RedirectUrl.ts
+++ b/src/Umbraco.Web.UI.Client/src/core/backend-api/models/RedirectUrl.ts
@@ -4,8 +4,8 @@
 
 export type RedirectUrl = {
     key?: string;
-    originalUrl?: string | null;
-    destinationUrl?: string | null;
+    originalUrl?: string;
+    destinationUrl?: string;
     created?: string;
     contentKey?: string;
     culture?: string | null;
diff --git a/src/Umbraco.Web.UI.Client/src/core/backend-api/models/SearchResult.ts b/src/Umbraco.Web.UI.Client/src/core/backend-api/models/SearchResult.ts
index e468166035..d6dc140d8d 100644
--- a/src/Umbraco.Web.UI.Client/src/core/backend-api/models/SearchResult.ts
+++ b/src/Umbraco.Web.UI.Client/src/core/backend-api/models/SearchResult.ts
@@ -5,9 +5,9 @@
 import type { Field } from './Field';
 
 export type SearchResult = {
-    id?: string | null;
+    id?: string;
     score?: number;
     readonly fieldCount?: number;
-    fields?: Array<Field> | null;
+    fields?: Array<Field>;
 };
 
diff --git a/src/Umbraco.Web.UI.Client/src/core/backend-api/models/Searcher.ts b/src/Umbraco.Web.UI.Client/src/core/backend-api/models/Searcher.ts
index bc89694c3a..1e55566aa3 100644
--- a/src/Umbraco.Web.UI.Client/src/core/backend-api/models/Searcher.ts
+++ b/src/Umbraco.Web.UI.Client/src/core/backend-api/models/Searcher.ts
@@ -3,6 +3,6 @@
 /* eslint-disable */
 
 export type Searcher = {
-    name?: string | null;
+    name?: string;
 };
 
diff --git a/src/Umbraco.Web.UI.Client/src/core/backend-api/models/Template.ts b/src/Umbraco.Web.UI.Client/src/core/backend-api/models/Template.ts
new file mode 100644
index 0000000000..3055919ab5
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/core/backend-api/models/Template.ts
@@ -0,0 +1,11 @@
+/* istanbul ignore file */
+/* tslint:disable */
+/* eslint-disable */
+
+export type Template = {
+    name?: string;
+    alias?: string;
+    content?: string | null;
+    key?: string;
+};
+
diff --git a/src/Umbraco.Web.UI.Client/src/core/backend-api/models/TemplateCreateModel.ts b/src/Umbraco.Web.UI.Client/src/core/backend-api/models/TemplateCreateModel.ts
new file mode 100644
index 0000000000..6a393e41ba
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/core/backend-api/models/TemplateCreateModel.ts
@@ -0,0 +1,10 @@
+/* istanbul ignore file */
+/* tslint:disable */
+/* eslint-disable */
+
+export type TemplateCreateModel = {
+    name?: string;
+    alias?: string;
+    content?: string | null;
+};
+
diff --git a/src/Umbraco.Web.UI.Client/src/core/backend-api/models/TemplateQueryExecuteFilterModel.ts b/src/Umbraco.Web.UI.Client/src/core/backend-api/models/TemplateQueryExecuteFilterModel.ts
new file mode 100644
index 0000000000..d04281f02d
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/core/backend-api/models/TemplateQueryExecuteFilterModel.ts
@@ -0,0 +1,12 @@
+/* istanbul ignore file */
+/* tslint:disable */
+/* eslint-disable */
+
+import type { Operator } from './Operator';
+
+export type TemplateQueryExecuteFilterModel = {
+    propertyAlias?: string;
+    constraintValue?: string;
+    operator?: Operator;
+};
+
diff --git a/src/Umbraco.Web.UI.Client/src/core/backend-api/models/TemplateQueryExecuteModel.ts b/src/Umbraco.Web.UI.Client/src/core/backend-api/models/TemplateQueryExecuteModel.ts
new file mode 100644
index 0000000000..53481eabcf
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/core/backend-api/models/TemplateQueryExecuteModel.ts
@@ -0,0 +1,15 @@
+/* istanbul ignore file */
+/* tslint:disable */
+/* eslint-disable */
+
+import type { TemplateQueryExecuteFilterModel } from './TemplateQueryExecuteFilterModel';
+import type { TemplateQueryExecuteSortModel } from './TemplateQueryExecuteSortModel';
+
+export type TemplateQueryExecuteModel = {
+    rootContentKey?: string | null;
+    contentTypeAlias?: string | null;
+    filters?: Array<TemplateQueryExecuteFilterModel> | null;
+    sort?: TemplateQueryExecuteSortModel;
+    take?: number;
+};
+
diff --git a/src/Umbraco.Web.UI.Client/src/core/backend-api/models/TemplateQueryExecuteSortModel.ts b/src/Umbraco.Web.UI.Client/src/core/backend-api/models/TemplateQueryExecuteSortModel.ts
new file mode 100644
index 0000000000..d3a1b6cf56
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/core/backend-api/models/TemplateQueryExecuteSortModel.ts
@@ -0,0 +1,9 @@
+/* istanbul ignore file */
+/* tslint:disable */
+/* eslint-disable */
+
+export type TemplateQueryExecuteSortModel = {
+    propertyAlias?: string;
+    direction?: string | null;
+};
+
diff --git a/src/Umbraco.Web.UI.Client/src/core/backend-api/models/TemplateQueryOperator.ts b/src/Umbraco.Web.UI.Client/src/core/backend-api/models/TemplateQueryOperator.ts
new file mode 100644
index 0000000000..f1e3cd66cb
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/core/backend-api/models/TemplateQueryOperator.ts
@@ -0,0 +1,12 @@
+/* istanbul ignore file */
+/* tslint:disable */
+/* eslint-disable */
+
+import type { Operator } from './Operator';
+import type { TemplateQueryPropertyType } from './TemplateQueryPropertyType';
+
+export type TemplateQueryOperator = {
+    operator?: Operator;
+    applicableTypes?: Array<TemplateQueryPropertyType>;
+};
+
diff --git a/src/Umbraco.Web.UI.Client/src/core/backend-api/models/TemplateQueryProperty.ts b/src/Umbraco.Web.UI.Client/src/core/backend-api/models/TemplateQueryProperty.ts
new file mode 100644
index 0000000000..2b8472d303
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/core/backend-api/models/TemplateQueryProperty.ts
@@ -0,0 +1,11 @@
+/* istanbul ignore file */
+/* tslint:disable */
+/* eslint-disable */
+
+import type { TemplateQueryPropertyType } from './TemplateQueryPropertyType';
+
+export type TemplateQueryProperty = {
+    alias?: string;
+    type?: TemplateQueryPropertyType;
+};
+
diff --git a/src/Umbraco.Web.UI.Client/src/core/backend-api/models/TemplateQueryPropertyType.ts b/src/Umbraco.Web.UI.Client/src/core/backend-api/models/TemplateQueryPropertyType.ts
new file mode 100644
index 0000000000..2ec073e349
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/core/backend-api/models/TemplateQueryPropertyType.ts
@@ -0,0 +1,9 @@
+/* istanbul ignore file */
+/* tslint:disable */
+/* eslint-disable */
+
+export enum TemplateQueryPropertyType {
+    STRING = 'String',
+    DATE_TIME = 'DateTime',
+    INTEGER = 'Integer',
+}
diff --git a/src/Umbraco.Web.UI.Client/src/core/backend-api/models/TemplateQueryResult.ts b/src/Umbraco.Web.UI.Client/src/core/backend-api/models/TemplateQueryResult.ts
new file mode 100644
index 0000000000..92773aedb5
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/core/backend-api/models/TemplateQueryResult.ts
@@ -0,0 +1,13 @@
+/* istanbul ignore file */
+/* tslint:disable */
+/* eslint-disable */
+
+import type { TemplateQueryResultItem } from './TemplateQueryResultItem';
+
+export type TemplateQueryResult = {
+    queryExpression?: string;
+    sampleResults?: Array<TemplateQueryResultItem>;
+    resultCount?: number;
+    executionTime?: number;
+};
+
diff --git a/src/Umbraco.Web.UI.Client/src/core/backend-api/models/TemplateQueryResultItem.ts b/src/Umbraco.Web.UI.Client/src/core/backend-api/models/TemplateQueryResultItem.ts
new file mode 100644
index 0000000000..f04b8cbe5b
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/core/backend-api/models/TemplateQueryResultItem.ts
@@ -0,0 +1,9 @@
+/* istanbul ignore file */
+/* tslint:disable */
+/* eslint-disable */
+
+export type TemplateQueryResultItem = {
+    icon?: string;
+    name?: string;
+};
+
diff --git a/src/Umbraco.Web.UI.Client/src/core/backend-api/models/TemplateQuerySettings.ts b/src/Umbraco.Web.UI.Client/src/core/backend-api/models/TemplateQuerySettings.ts
new file mode 100644
index 0000000000..cc21151d6c
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/core/backend-api/models/TemplateQuerySettings.ts
@@ -0,0 +1,13 @@
+/* istanbul ignore file */
+/* tslint:disable */
+/* eslint-disable */
+
+import type { TemplateQueryOperator } from './TemplateQueryOperator';
+import type { TemplateQueryProperty } from './TemplateQueryProperty';
+
+export type TemplateQuerySettings = {
+    contentTypeAliases?: Array<string>;
+    properties?: Array<TemplateQueryProperty>;
+    operators?: Array<TemplateQueryOperator>;
+};
+
diff --git a/src/Umbraco.Web.UI.Client/src/core/backend-api/models/TemplateScaffold.ts b/src/Umbraco.Web.UI.Client/src/core/backend-api/models/TemplateScaffold.ts
new file mode 100644
index 0000000000..a6de02512b
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/core/backend-api/models/TemplateScaffold.ts
@@ -0,0 +1,8 @@
+/* istanbul ignore file */
+/* tslint:disable */
+/* eslint-disable */
+
+export type TemplateScaffold = {
+    content?: string;
+};
+
diff --git a/src/Umbraco.Web.UI.Client/src/core/backend-api/models/TemplateUpdateModel.ts b/src/Umbraco.Web.UI.Client/src/core/backend-api/models/TemplateUpdateModel.ts
new file mode 100644
index 0000000000..f33c895029
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/core/backend-api/models/TemplateUpdateModel.ts
@@ -0,0 +1,10 @@
+/* istanbul ignore file */
+/* tslint:disable */
+/* eslint-disable */
+
+export type TemplateUpdateModel = {
+    name?: string;
+    alias?: string;
+    content?: string | null;
+};
+
diff --git a/src/Umbraco.Web.UI.Client/src/core/backend-api/models/Type.ts b/src/Umbraco.Web.UI.Client/src/core/backend-api/models/Type.ts
index 5aa4d99801..3b3f03fe0d 100644
--- a/src/Umbraco.Web.UI.Client/src/core/backend-api/models/Type.ts
+++ b/src/Umbraco.Web.UI.Client/src/core/backend-api/models/Type.ts
@@ -14,8 +14,8 @@ import type { StructLayoutAttribute } from './StructLayoutAttribute';
 import type { TypeAttributes } from './TypeAttributes';
 
 export type Type = {
-    readonly name?: string | null;
-    readonly customAttributes?: Array<CustomAttributeData> | null;
+    readonly name?: string;
+    readonly customAttributes?: Array<CustomAttributeData>;
     readonly isCollectible?: boolean;
     readonly metadataToken?: number;
     readonly isInterface?: boolean;
@@ -44,7 +44,7 @@ export type Type = {
     readonly isVariableBoundArray?: boolean;
     readonly isByRefLike?: boolean;
     readonly hasElementType?: boolean;
-    readonly genericTypeArguments?: Array<Type> | null;
+    readonly genericTypeArguments?: Array<Type>;
     readonly genericParameterPosition?: number;
     genericParameterAttributes?: GenericParameterAttributes;
     attributes?: TypeAttributes;
diff --git a/src/Umbraco.Web.UI.Client/src/core/backend-api/models/TypeInfo.ts b/src/Umbraco.Web.UI.Client/src/core/backend-api/models/TypeInfo.ts
index 1d5cfc6397..4010b30ea1 100644
--- a/src/Umbraco.Web.UI.Client/src/core/backend-api/models/TypeInfo.ts
+++ b/src/Umbraco.Web.UI.Client/src/core/backend-api/models/TypeInfo.ts
@@ -20,8 +20,8 @@ import type { Type } from './Type';
 import type { TypeAttributes } from './TypeAttributes';
 
 export type TypeInfo = {
-    readonly name?: string | null;
-    readonly customAttributes?: Array<CustomAttributeData> | null;
+    readonly name?: string;
+    readonly customAttributes?: Array<CustomAttributeData>;
     readonly isCollectible?: boolean;
     readonly metadataToken?: number;
     readonly isInterface?: boolean;
@@ -50,7 +50,7 @@ export type TypeInfo = {
     readonly isVariableBoundArray?: boolean;
     readonly isByRefLike?: boolean;
     readonly hasElementType?: boolean;
-    readonly genericTypeArguments?: Array<Type> | null;
+    readonly genericTypeArguments?: Array<Type>;
     readonly genericParameterPosition?: number;
     genericParameterAttributes?: GenericParameterAttributes;
     attributes?: TypeAttributes;
@@ -91,14 +91,14 @@ export type TypeInfo = {
     readonly isSerializable?: boolean;
     readonly containsGenericParameters?: boolean;
     readonly isVisible?: boolean;
-    readonly genericTypeParameters?: Array<Type> | null;
-    readonly declaredConstructors?: Array<ConstructorInfo> | null;
-    readonly declaredEvents?: Array<EventInfo> | null;
-    readonly declaredFields?: Array<FieldInfo> | null;
-    readonly declaredMembers?: Array<MemberInfo> | null;
-    readonly declaredMethods?: Array<MethodInfo> | null;
-    readonly declaredNestedTypes?: Array<TypeInfo> | null;
-    readonly declaredProperties?: Array<PropertyInfo> | null;
-    readonly implementedInterfaces?: Array<Type> | null;
+    readonly genericTypeParameters?: Array<Type>;
+    readonly declaredConstructors?: Array<ConstructorInfo>;
+    readonly declaredEvents?: Array<EventInfo>;
+    readonly declaredFields?: Array<FieldInfo>;
+    readonly declaredMembers?: Array<MemberInfo>;
+    readonly declaredMethods?: Array<MethodInfo>;
+    readonly declaredNestedTypes?: Array<TypeInfo>;
+    readonly declaredProperties?: Array<PropertyInfo>;
+    readonly implementedInterfaces?: Array<Type>;
 };
 
diff --git a/src/Umbraco.Web.UI.Client/src/core/backend-api/models/UpgradeSettings.ts b/src/Umbraco.Web.UI.Client/src/core/backend-api/models/UpgradeSettings.ts
index 88faaeecc7..f3b582ab1d 100644
--- a/src/Umbraco.Web.UI.Client/src/core/backend-api/models/UpgradeSettings.ts
+++ b/src/Umbraco.Web.UI.Client/src/core/backend-api/models/UpgradeSettings.ts
@@ -3,10 +3,10 @@
 /* eslint-disable */
 
 export type UpgradeSettings = {
-    currentState?: string | null;
-    newState?: string | null;
-    newVersion?: string | null;
-    oldVersion?: string | null;
-    readonly reportUrl?: string | null;
+    currentState?: string;
+    newState?: string;
+    newVersion?: string;
+    oldVersion?: string;
+    readonly reportUrl?: string;
 };
 
diff --git a/src/Umbraco.Web.UI.Client/src/core/backend-api/models/UserSettings.ts b/src/Umbraco.Web.UI.Client/src/core/backend-api/models/UserSettings.ts
index 1b875f4d36..ddc42d069b 100644
--- a/src/Umbraco.Web.UI.Client/src/core/backend-api/models/UserSettings.ts
+++ b/src/Umbraco.Web.UI.Client/src/core/backend-api/models/UserSettings.ts
@@ -7,6 +7,6 @@ import type { ConsentLevel } from './ConsentLevel';
 export type UserSettings = {
     minCharLength?: number;
     minNonAlphaNumericLength?: number;
-    consentLevels?: Array<ConsentLevel> | null;
+    consentLevels?: Array<ConsentLevel>;
 };
 
diff --git a/src/Umbraco.Web.UI.Client/src/core/backend-api/models/Version.ts b/src/Umbraco.Web.UI.Client/src/core/backend-api/models/Version.ts
index 3ee6e570a7..35249a3fba 100644
--- a/src/Umbraco.Web.UI.Client/src/core/backend-api/models/Version.ts
+++ b/src/Umbraco.Web.UI.Client/src/core/backend-api/models/Version.ts
@@ -3,6 +3,6 @@
 /* eslint-disable */
 
 export type Version = {
-    version?: string | null;
+    version?: string;
 };
 
diff --git a/src/Umbraco.Web.UI.Client/src/core/backend-api/services/DataTypeResource.ts b/src/Umbraco.Web.UI.Client/src/core/backend-api/services/DataTypeResource.ts
index 51a0f68819..fffdb6fb45 100644
--- a/src/Umbraco.Web.UI.Client/src/core/backend-api/services/DataTypeResource.ts
+++ b/src/Umbraco.Web.UI.Client/src/core/backend-api/services/DataTypeResource.ts
@@ -3,8 +3,12 @@
 /* eslint-disable */
 import type { DataType } from '../models/DataType';
 import type { DataTypeCreateModel } from '../models/DataTypeCreateModel';
+import type { DataTypeReference } from '../models/DataTypeReference';
 import type { DataTypeUpdateModel } from '../models/DataTypeUpdateModel';
+import type { Folder } from '../models/Folder';
+import type { FolderCreateModel } from '../models/FolderCreateModel';
 import type { FolderTreeItem } from '../models/FolderTreeItem';
+import type { FolderUpdateModel } from '../models/FolderUpdateModel';
 import type { PagedFolderTreeItem } from '../models/PagedFolderTreeItem';
 
 import type { CancelablePromise } from '../core/CancelablePromise';
@@ -14,14 +18,14 @@ import { request as __request } from '../core/request';
 export class DataTypeResource {
 
     /**
-     * @returns DataType Success
+     * @returns any Created
      * @throws ApiError
      */
     public static postDataType({
         requestBody,
     }: {
         requestBody?: DataTypeCreateModel,
-    }): CancelablePromise<DataType> {
+    }): CancelablePromise<any> {
         return __request(OpenAPI, {
             method: 'POST',
             url: '/umbraco/management/api/v1/data-type',
@@ -55,7 +59,28 @@ export class DataTypeResource {
     }
 
     /**
-     * @returns DataType Success
+     * @returns any Success
+     * @throws ApiError
+     */
+    public static deleteDataTypeByKey({
+        key,
+    }: {
+        key: string,
+    }): CancelablePromise<any> {
+        return __request(OpenAPI, {
+            method: 'DELETE',
+            url: '/umbraco/management/api/v1/data-type/{key}',
+            path: {
+                'key': key,
+            },
+            errors: {
+                404: `Not Found`,
+            },
+        });
+    }
+
+    /**
+     * @returns any Success
      * @throws ApiError
      */
     public static putDataTypeByKey({
@@ -64,7 +89,7 @@ export class DataTypeResource {
     }: {
         key: string,
         requestBody?: DataTypeUpdateModel,
-    }): CancelablePromise<DataType> {
+    }): CancelablePromise<any> {
         return __request(OpenAPI, {
             method: 'PUT',
             url: '/umbraco/management/api/v1/data-type/{key}',
@@ -79,6 +104,111 @@ export class DataTypeResource {
         });
     }
 
+    /**
+     * @returns DataTypeReference Success
+     * @throws ApiError
+     */
+    public static getDataTypeByKeyReferences({
+        key,
+    }: {
+        key: string,
+    }): CancelablePromise<Array<DataTypeReference>> {
+        return __request(OpenAPI, {
+            method: 'GET',
+            url: '/umbraco/management/api/v1/data-type/{key}/references',
+            path: {
+                'key': key,
+            },
+            errors: {
+                404: `Not Found`,
+            },
+        });
+    }
+
+    /**
+     * @returns any Created
+     * @throws ApiError
+     */
+    public static postDataTypeFolder({
+        requestBody,
+    }: {
+        requestBody?: FolderCreateModel,
+    }): CancelablePromise<any> {
+        return __request(OpenAPI, {
+            method: 'POST',
+            url: '/umbraco/management/api/v1/data-type/folder',
+            body: requestBody,
+            mediaType: 'application/json',
+        });
+    }
+
+    /**
+     * @returns Folder Success
+     * @throws ApiError
+     */
+    public static getDataTypeFolderByKey({
+        key,
+    }: {
+        key: string,
+    }): CancelablePromise<Folder> {
+        return __request(OpenAPI, {
+            method: 'GET',
+            url: '/umbraco/management/api/v1/data-type/folder/{key}',
+            path: {
+                'key': key,
+            },
+            errors: {
+                404: `Not Found`,
+            },
+        });
+    }
+
+    /**
+     * @returns any Success
+     * @throws ApiError
+     */
+    public static deleteDataTypeFolderByKey({
+        key,
+    }: {
+        key: string,
+    }): CancelablePromise<any> {
+        return __request(OpenAPI, {
+            method: 'DELETE',
+            url: '/umbraco/management/api/v1/data-type/folder/{key}',
+            path: {
+                'key': key,
+            },
+            errors: {
+                404: `Not Found`,
+            },
+        });
+    }
+
+    /**
+     * @returns any Success
+     * @throws ApiError
+     */
+    public static putDataTypeFolderByKey({
+        key,
+        requestBody,
+    }: {
+        key: string,
+        requestBody?: FolderUpdateModel,
+    }): CancelablePromise<any> {
+        return __request(OpenAPI, {
+            method: 'PUT',
+            url: '/umbraco/management/api/v1/data-type/folder/{key}',
+            path: {
+                'key': key,
+            },
+            body: requestBody,
+            mediaType: 'application/json',
+            errors: {
+                404: `Not Found`,
+            },
+        });
+    }
+
     /**
      * @returns PagedFolderTreeItem Success
      * @throws ApiError
diff --git a/src/Umbraco.Web.UI.Client/src/core/backend-api/services/TemplateResource.ts b/src/Umbraco.Web.UI.Client/src/core/backend-api/services/TemplateResource.ts
index 5050c7314f..771d6ef5ef 100644
--- a/src/Umbraco.Web.UI.Client/src/core/backend-api/services/TemplateResource.ts
+++ b/src/Umbraco.Web.UI.Client/src/core/backend-api/services/TemplateResource.ts
@@ -3,6 +3,13 @@
 /* eslint-disable */
 import type { EntityTreeItem } from '../models/EntityTreeItem';
 import type { PagedEntityTreeItem } from '../models/PagedEntityTreeItem';
+import type { Template } from '../models/Template';
+import type { TemplateCreateModel } from '../models/TemplateCreateModel';
+import type { TemplateQueryExecuteModel } from '../models/TemplateQueryExecuteModel';
+import type { TemplateQueryResult } from '../models/TemplateQueryResult';
+import type { TemplateQuerySettings } from '../models/TemplateQuerySettings';
+import type { TemplateScaffold } from '../models/TemplateScaffold';
+import type { TemplateUpdateModel } from '../models/TemplateUpdateModel';
 
 import type { CancelablePromise } from '../core/CancelablePromise';
 import { OpenAPI } from '../core/OpenAPI';
@@ -10,6 +17,142 @@ import { request as __request } from '../core/request';
 
 export class TemplateResource {
 
+    /**
+     * @returns any Created
+     * @throws ApiError
+     */
+    public static postTemplate({
+        requestBody,
+    }: {
+        requestBody?: TemplateCreateModel,
+    }): CancelablePromise<any> {
+        return __request(OpenAPI, {
+            method: 'POST',
+            url: '/umbraco/management/api/v1/template',
+            body: requestBody,
+            mediaType: 'application/json',
+            errors: {
+                404: `Not Found`,
+            },
+        });
+    }
+
+    /**
+     * @returns Template Success
+     * @throws ApiError
+     */
+    public static getTemplateByKey({
+        key,
+    }: {
+        key: string,
+    }): CancelablePromise<Template> {
+        return __request(OpenAPI, {
+            method: 'GET',
+            url: '/umbraco/management/api/v1/template/{key}',
+            path: {
+                'key': key,
+            },
+            errors: {
+                404: `Not Found`,
+            },
+        });
+    }
+
+    /**
+     * @returns any Success
+     * @throws ApiError
+     */
+    public static deleteTemplateByKey({
+        key,
+    }: {
+        key: string,
+    }): CancelablePromise<any> {
+        return __request(OpenAPI, {
+            method: 'DELETE',
+            url: '/umbraco/management/api/v1/template/{key}',
+            path: {
+                'key': key,
+            },
+            errors: {
+                404: `Not Found`,
+            },
+        });
+    }
+
+    /**
+     * @returns any Success
+     * @throws ApiError
+     */
+    public static putTemplateByKey({
+        key,
+        requestBody,
+    }: {
+        key: string,
+        requestBody?: TemplateUpdateModel,
+    }): CancelablePromise<any> {
+        return __request(OpenAPI, {
+            method: 'PUT',
+            url: '/umbraco/management/api/v1/template/{key}',
+            path: {
+                'key': key,
+            },
+            body: requestBody,
+            mediaType: 'application/json',
+            errors: {
+                404: `Not Found`,
+            },
+        });
+    }
+
+    /**
+     * @returns TemplateQueryResult Success
+     * @throws ApiError
+     */
+    public static postTemplateQueryExecute({
+        requestBody,
+    }: {
+        requestBody?: TemplateQueryExecuteModel,
+    }): CancelablePromise<TemplateQueryResult> {
+        return __request(OpenAPI, {
+            method: 'POST',
+            url: '/umbraco/management/api/v1/template/query/execute',
+            body: requestBody,
+            mediaType: 'application/json',
+        });
+    }
+
+    /**
+     * @returns TemplateQuerySettings Success
+     * @throws ApiError
+     */
+    public static getTemplateQuerySettings(): CancelablePromise<TemplateQuerySettings> {
+        return __request(OpenAPI, {
+            method: 'GET',
+            url: '/umbraco/management/api/v1/template/query/settings',
+        });
+    }
+
+    /**
+     * @returns TemplateScaffold Success
+     * @throws ApiError
+     */
+    public static getTemplateScaffold({
+        masterTemplateAlias,
+    }: {
+        masterTemplateAlias?: string,
+    }): CancelablePromise<TemplateScaffold> {
+        return __request(OpenAPI, {
+            method: 'GET',
+            url: '/umbraco/management/api/v1/template/scaffold',
+            query: {
+                'masterTemplateAlias': masterTemplateAlias,
+            },
+            errors: {
+                404: `Not Found`,
+            },
+        });
+    }
+
     /**
      * @returns PagedEntityTreeItem Success
      * @throws ApiError