diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/settings/index.ts b/src/Umbraco.Web.UI.Client/src/backoffice/settings/index.ts
index 95f2a0e190..d3c2210290 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/settings/index.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/settings/index.ts
@@ -1,4 +1,4 @@
-import { UmbThemeContext } from '../themes/theme.context';
+import { UmbThemeContext } from './themes/theme.context';
 import { manifests as settingsSectionManifests } from './section.manifests';
 import { manifests as settingsMenuManifests } from './menu.manifests';
 import { manifests as dashboardManifests } from './dashboards/manifests';
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/themes/manifests.ts b/src/Umbraco.Web.UI.Client/src/backoffice/settings/themes/manifests.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/themes/manifests.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/settings/themes/manifests.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/themes/theme.context.ts b/src/Umbraco.Web.UI.Client/src/backoffice/settings/themes/theme.context.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/themes/theme.context.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/settings/themes/theme.context.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/themes/themes/dark.theme.css b/src/Umbraco.Web.UI.Client/src/backoffice/settings/themes/themes/dark.theme.css
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/themes/themes/dark.theme.css
rename to src/Umbraco.Web.UI.Client/src/backoffice/settings/themes/themes/dark.theme.css
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/themes/themes/high-contrast.theme.css b/src/Umbraco.Web.UI.Client/src/backoffice/settings/themes/themes/high-contrast.theme.css
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/themes/themes/high-contrast.theme.css
rename to src/Umbraco.Web.UI.Client/src/backoffice/settings/themes/themes/high-contrast.theme.css
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/code-editor/code-editor.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/code-editor/code-editor.element.ts
index 4a0a93652a..8aae312e80 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/code-editor/code-editor.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/code-editor/code-editor.element.ts
@@ -1,7 +1,7 @@
 import { css, html, PropertyValues } from 'lit';
 import { customElement, property } from 'lit/decorators.js';
 import { createRef, Ref, ref } from 'lit/directives/ref.js';
-import { UMB_THEME_CONTEXT_TOKEN } from '../../../themes/theme.context';
+import { UMB_THEME_CONTEXT_TOKEN } from '../../../settings/themes/theme.context';
 import { UmbCodeEditorController } from './code-editor.controller';
 import { CodeEditorLanguage, CodeEditorTheme, UmbCodeEditorHost } from './code-editor.model';
 import { monacoEditorStyles, monacoJumpingCursorHack } from './styles';
@@ -22,8 +22,6 @@ import { UmbLitElement } from '@umbraco-cms/internal/lit-element';
  */
 @customElement('umb-code-editor')
 export class UmbCodeEditorElement extends UmbLitElement implements UmbCodeEditorHost {
-	
-
 	private containerRef: Ref<HTMLElement> = createRef();
 
 	get container() {
@@ -146,7 +144,7 @@ export class UmbCodeEditorElement extends UmbLitElement implements UmbCodeEditor
 	render() {
 		return html` <div id="editor-container" ${ref(this.containerRef)}></div> `;
 	}
-	
+
 	static styles = [
 		monacoEditorStyles,
 		monacoJumpingCursorHack,
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/users/current-user/user-profile-apps/user-profile-app-themes.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/users/current-user/user-profile-apps/user-profile-app-themes.element.ts
index 4a7bd4e318..48de0499f0 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/users/current-user/user-profile-apps/user-profile-app-themes.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/users/current-user/user-profile-apps/user-profile-app-themes.element.ts
@@ -2,15 +2,13 @@ import { css, html } from 'lit';
 import { UUITextStyles } from '@umbraco-ui/uui-css/lib';
 import { customElement, state } from 'lit/decorators.js';
 import { UUISelectEvent } from '@umbraco-ui/uui';
-import { UmbThemeContext, UMB_THEME_CONTEXT_TOKEN } from '../../../themes/theme.context';
+import { UmbThemeContext, UMB_THEME_CONTEXT_TOKEN } from '../../../settings/themes/theme.context';
 import { UmbLitElement } from '@umbraco-cms/internal/lit-element';
 import { umbExtensionsRegistry } from '@umbraco-cms/backoffice/extensions-api';
 import { ManifestTheme } from '@umbraco-cms/backoffice/extensions-registry';
 
 @customElement('umb-user-profile-app-themes')
 export class UmbUserProfileAppThemesElement extends UmbLitElement {
-	
-
 	#themeService?: UmbThemeContext;
 
 	@state()
@@ -55,7 +53,7 @@ export class UmbUserProfileAppThemesElement extends UmbLitElement {
 				.options=${this.#options}></uui-select>
 		`;
 	}
-	
+
 	static styles = [
 		UUITextStyles,
 		css`