diff --git a/src/Umbraco.Web.UI.Client/src/external/rxjs/index.ts b/src/Umbraco.Web.UI.Client/src/external/rxjs/index.ts
index 66eddd1fb0..abee27205d 100644
--- a/src/Umbraco.Web.UI.Client/src/external/rxjs/index.ts
+++ b/src/Umbraco.Web.UI.Client/src/external/rxjs/index.ts
@@ -13,4 +13,5 @@ export {
 	tap,
 	of,
 	lastValueFrom,
+	firstValueFrom,
 } from 'rxjs';
diff --git a/src/Umbraco.Web.UI.Client/src/external/tinymce/index.ts b/src/Umbraco.Web.UI.Client/src/external/tinymce/index.ts
new file mode 100644
index 0000000000..a949629492
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/external/tinymce/index.ts
@@ -0,0 +1,3 @@
+export { AstNode, Editor } from 'tinymce';
+export type { EditorEvent } from 'tinymce';
+export { default as tinymce } from 'tinymce';
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/components/input-tiny-mce/input-tiny-mce.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/components/input-tiny-mce/input-tiny-mce.element.ts
index df18c48799..71a06a2ff1 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/components/input-tiny-mce/input-tiny-mce.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/components/input-tiny-mce/input-tiny-mce.element.ts
@@ -2,14 +2,14 @@ import { css, html } from 'lit';
 import { UUITextStyles } from '@umbraco-ui/uui-css/lib';
 import { customElement, property, state } from 'lit/decorators.js';
 import { FormControlMixin } from '@umbraco-ui/uui-base/lib/mixins';
-import tinymce, { AstNode, Editor, EditorEvent } from 'tinymce';
-import { firstValueFrom } from 'rxjs';
+import { tinymce, AstNode, Editor, EditorEvent } from '@umbraco-cms/backoffice/external/tinymce';
 import {
 	UmbCurrentUserStore,
 	UMB_CURRENT_USER_STORE_CONTEXT_TOKEN,
 } from '../../../users/current-user/current-user.store.js';
 import type { UmbLoggedInUser } from '../../../users/current-user/types.js';
 import { availableLanguages } from './input-tiny-mce.languages.js';
+import { firstValueFrom } from '@umbraco-cms/backoffice/external/rxjs';
 import {
 	TinyMcePluginArguments,
 	UmbTinyMcePluginBase,
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/tiny-mce/plugins/tiny-mce-macropicker.plugin.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/tiny-mce/plugins/tiny-mce-macropicker.plugin.ts
index 99f9f246b4..15ab4d285c 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/tiny-mce/plugins/tiny-mce-macropicker.plugin.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/tiny-mce/plugins/tiny-mce-macropicker.plugin.ts
@@ -1,4 +1,4 @@
-import { AstNode } from 'tinymce';
+import { AstNode } from '@umbraco-cms/backoffice/external/tinymce';
 import { MacroSyntaxData, UmbMacroService } from '@umbraco-cms/backoffice/macro';
 import { TinyMcePluginArguments, UmbTinyMcePluginBase } from '@umbraco-cms/backoffice/extension-registry';
 import { UmbModalContext, UMB_MODAL_CONTEXT_TOKEN, UMB_CONFIRM_MODAL } from '@umbraco-cms/backoffice/modal';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/templates/repository/template.repository.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/templates/repository/template.repository.ts
index 3ec8691bee..c254938050 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/templating/templates/repository/template.repository.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/templating/templates/repository/template.repository.ts
@@ -1,3 +1,7 @@
+import { UmbTemplateDetailServerDataSource } from './sources/template.detail.server.data.js';
+import { UmbTemplateTreeStore, UMB_TEMPLATE_TREE_STORE_CONTEXT_TOKEN } from './template.tree.store.js';
+import { UmbTemplateStore, UMB_TEMPLATE_STORE_CONTEXT_TOKEN } from './template.store.js';
+import { UmbTemplateTreeServerDataSource } from './sources/template.tree.server.data.js';
 import type {
 	UmbDetailRepository,
 	UmbItemRepository,
@@ -15,11 +19,7 @@ import {
 	TemplateResponseModel,
 	UpdateTemplateRequestModel,
 } from '@umbraco-cms/backoffice/backend-api';
-import { UmbTemplateTreeStore, UMB_TEMPLATE_TREE_STORE_CONTEXT_TOKEN } from './template.tree.store.js';
-import { UmbTemplateStore, UMB_TEMPLATE_STORE_CONTEXT_TOKEN } from './template.store.js';
-import { UmbTemplateTreeServerDataSource } from './sources/template.tree.server.data.js';
-import { UmbTemplateDetailServerDataSource } from './sources/template.detail.server.data.js';
-import { Observable } from 'rxjs';
+import { Observable } from '@umbraco-cms/backoffice/external/rxjs';
 
 export class UmbTemplateRepository
 	implements
diff --git a/src/Umbraco.Web.UI.Client/tsconfig.json b/src/Umbraco.Web.UI.Client/tsconfig.json
index 8764d7ffd9..b4d77e4bdd 100644
--- a/src/Umbraco.Web.UI.Client/tsconfig.json
+++ b/src/Umbraco.Web.UI.Client/tsconfig.json
@@ -26,6 +26,7 @@
 			"@umbraco-cms/backoffice/external/uuid": ["src/external/uuid"],
 			"@umbraco-cms/backoffice/external/lodash": ["src/external/lodash"],
 			"@umbraco-cms/backoffice/external/uui": ["src/external/uui"],
+			"@umbraco-cms/backoffice/external/tinymce": ["src/external/tinymce"],
 
 			"@umbraco-cms/backoffice/context-api": ["src/libs/context-api"],
 			"@umbraco-cms/backoffice/controller-api": ["src/libs/controller-api"],
diff --git a/src/Umbraco.Web.UI.Client/web-test-runner.config.mjs b/src/Umbraco.Web.UI.Client/web-test-runner.config.mjs
index 23f2254fa7..cbcca6bea6 100644
--- a/src/Umbraco.Web.UI.Client/web-test-runner.config.mjs
+++ b/src/Umbraco.Web.UI.Client/web-test-runner.config.mjs
@@ -40,6 +40,7 @@ export default {
 						'@umbraco-cms/backoffice/external/router-slot': './src/external/router-slot/index.ts',
 						'@umbraco-cms/backoffice/external/uuid': './src/external/uuid/index.ts',
 						'@umbraco-cms/backoffice/external/lodash': './src/external/lodash/index.ts',
+						'@umbraco-cms/backoffice/external/tinymce': './src/external/tinymce/index.ts',
 
 						'@umbraco-cms/backoffice/context-api': './src/libs/context-api/index.ts',
 						'@umbraco-cms/backoffice/controller-api': './src/libs/controller-api/index.ts',