diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/components/input-image-cropper/image-cropper-focus-setter.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/components/input-image-cropper/image-cropper-focus-setter.element.ts
index ef0298ddcc..4042a2a5ec 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/components/input-image-cropper/image-cropper-focus-setter.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/components/input-image-cropper/image-cropper-focus-setter.element.ts
@@ -1,7 +1,15 @@
-import { LitElement, PropertyValueMap, css, html, nothing } from 'lit';
-import { customElement, property, query } from 'lit/decorators.js';
 import { clamp } from './mathUtils.js';
 import { UmbImageCropperFocalPoint } from './index.js';
+import {
+	LitElement,
+	PropertyValueMap,
+	css,
+	html,
+	nothing,
+	customElement,
+	property,
+	query,
+} from '@umbraco-cms/backoffice/external/lit';
 
 @customElement('umb-image-cropper-focus-setter')
 export class UmbImageCropperFocusSetterElement extends LitElement {
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/components/input-image-cropper/image-cropper-preview.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/components/input-image-cropper/image-cropper-preview.element.ts
index 4f9cd39b83..438cf91f8e 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/components/input-image-cropper/image-cropper-preview.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/components/input-image-cropper/image-cropper-preview.element.ts
@@ -1,7 +1,6 @@
-import { LitElement, css, html, nothing } from 'lit';
-import { customElement, property, query } from 'lit/decorators.js';
 import { clamp, calculateExtrapolatedValue } from './mathUtils.js';
 import type { UmbImageCropperCrop, UmbImageCropperFocalPoint } from './index.js';
+import { LitElement, css, html, nothing, customElement, property, query } from '@umbraco-cms/backoffice/external/lit';
 
 @customElement('umb-image-cropper-preview')
 export class UmbImageCropperPreviewElement extends LitElement {
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/components/input-image-cropper/image-cropper.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/components/input-image-cropper/image-cropper.element.ts
index e59f9dd993..0db9ff8d86 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/components/input-image-cropper/image-cropper.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/components/input-image-cropper/image-cropper.element.ts
@@ -1,7 +1,15 @@
-import { LitElement, PropertyValueMap, css, html } from 'lit';
-import { customElement, property, query, state } from 'lit/decorators.js';
 import { clamp, calculateExtrapolatedValue, inverseLerp, lerp } from './mathUtils.js';
 import { UmbImageCropperCrop, UmbImageCropperFocalPoint } from './index.js';
+import {
+	customElement,
+	property,
+	query,
+	state,
+	LitElement,
+	PropertyValueMap,
+	css,
+	html,
+} from '@umbraco-cms/backoffice/external/lit';
 
 @customElement('umb-image-cropper')
 export class UmbImageCropperElement extends LitElement {
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/components/input-image-cropper/input-image-cropper.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/components/input-image-cropper/input-image-cropper.element.ts
index 8250b30a94..63282ae372 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/components/input-image-cropper/input-image-cropper.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/components/input-image-cropper/input-image-cropper.element.ts
@@ -1,10 +1,7 @@
-import { LitElement, css, html } from 'lit';
-import { customElement, property, state } from 'lit/decorators.js';
-
+import { LitElement, css, html, customElement, property, state, repeat } from '@umbraco-cms/backoffice/external/lit';
 import './image-cropper.element.js';
 import './image-cropper-focus-setter.element.js';
 import './image-cropper-preview.element.js';
-import { repeat } from 'lit/directives/repeat.js';
 import type { UmbImageCropperElement } from './image-cropper.element.js';
 import {
 	UmbImageCropperCrop,
diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/modals/create/user-create-modal.element.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/modals/create/user-create-modal.element.ts
index 847053c091..a22865d713 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/user/user/modals/create/user-create-modal.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/modals/create/user-create-modal.element.ts
@@ -2,8 +2,7 @@ import { UmbUserRepository } from '../../repository/user.repository.js';
 import { type UmbUserGroupInputElement } from '@umbraco-cms/backoffice/user-group';
 import { UmbTextStyles } from '@umbraco-cms/backoffice/style';
 import { css, html, customElement, query } from '@umbraco-cms/backoffice/external/lit';
-import { UmbModalBaseElement } from '@umbraco-cms/backoffice/modal';
-import {
+import { UmbModalBaseElement ,
 	UMB_MODAL_MANAGER_CONTEXT_TOKEN,
 	UMB_CREATE_USER_SUCCESS_MODAL,
 	UmbModalManagerContext,