diff --git a/.github/scripts/dev.js b/.github/scripts/dev.js
index e022c50b55c..5ff1f1bcbd5 100644
--- a/.github/scripts/dev.js
+++ b/.github/scripts/dev.js
@@ -50,20 +50,26 @@ const COMMAND_TYPESCRIPT = {
     env: {}
 };
 
-const COMMAND_ADMINX = {
+const COMMANDS_ADMINX = [{
+    name: 'adminXDS',
+    command: 'nx watch --projects=apps/admin-x-design-system -- nx run \\$NX_PROJECT_NAME:build --skip-nx-cache',
+    cwd: path.resolve(__dirname, '../..'),
+    prefixColor: '#C35831',
+    env: {}
+}, {
     name: 'adminX',
-    command: 'yarn dev',
+    command: 'yarn nx build && yarn dev',
     cwd: path.resolve(__dirname, '../../apps/admin-x-settings'),
     prefixColor: '#C35831',
     env: {}
-};
+}];
 
 if (DASH_DASH_ARGS.includes('ghost')) {
     commands = [COMMAND_GHOST, COMMAND_TYPESCRIPT];
 } else if (DASH_DASH_ARGS.includes('admin')) {
-    commands = [COMMAND_ADMIN, COMMAND_ADMINX];
+    commands = [COMMAND_ADMIN, ...COMMANDS_ADMINX];
 } else {
-    commands = [COMMAND_GHOST, COMMAND_TYPESCRIPT, COMMAND_ADMIN, COMMAND_ADMINX];
+    commands = [COMMAND_GHOST, COMMAND_TYPESCRIPT, COMMAND_ADMIN, ...COMMANDS_ADMINX];
 }
 
 if (DASH_DASH_ARGS.includes('portal') || DASH_DASH_ARGS.includes('all')) {
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index f42641eaafa..eb0620a7200 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -167,7 +167,7 @@ jobs:
           key: ${{ env.HEAD_COMMIT }}
 
       - name: Set up Node
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         env:
           FORCE_COLOR: 0
         with:
@@ -192,7 +192,7 @@ jobs:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 100
-      - uses: actions/setup-node@v3
+      - uses: actions/setup-node@v4
         env:
           FORCE_COLOR: 0
         with:
@@ -228,7 +228,7 @@ jobs:
         || needs.job_get_metadata.outputs.changed_core == 'true'
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-node@v3
+      - uses: actions/setup-node@v4
         with:
           node-version: "18.12.1"
 
@@ -252,7 +252,7 @@ jobs:
       COVERAGE: true
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-node@v3
+      - uses: actions/setup-node@v4
         with:
           node-version: "18.12.1"
 
@@ -294,7 +294,7 @@ jobs:
     - uses: actions/checkout@v4
       with:
         submodules: true
-    - uses: actions/setup-node@v3
+    - uses: actions/setup-node@v4
       env:
         FORCE_COLOR: 0
       with:
@@ -371,7 +371,7 @@ jobs:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 100
-      - uses: actions/setup-node@v3
+      - uses: actions/setup-node@v4
         env:
           FORCE_COLOR: 0
         with:
@@ -418,7 +418,7 @@ jobs:
     name: Database tests (Node ${{ matrix.node }}, ${{ matrix.env.DB }})
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-node@v3
+      - uses: actions/setup-node@v4
         env:
           FORCE_COLOR: 0
         with:
@@ -539,7 +539,7 @@ jobs:
     name: Regression tests (Node ${{ matrix.node }}, ${{ matrix.env.DB }})
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-node@v3
+      - uses: actions/setup-node@v4
         env:
           FORCE_COLOR: 0
         with:
@@ -590,7 +590,7 @@ jobs:
       CI: true
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-node@v3
+      - uses: actions/setup-node@v4
         env:
           FORCE_COLOR: 0
         with:
@@ -643,7 +643,7 @@ jobs:
       CI: true
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-node@v3
+      - uses: actions/setup-node@v4
         env:
           FORCE_COLOR: 0
         with:
@@ -696,7 +696,7 @@ jobs:
       CI: true
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-node@v3
+      - uses: actions/setup-node@v4
         env:
           FORCE_COLOR: 0
         with:
@@ -750,7 +750,7 @@ jobs:
         with:
           fetch-depth: 0
           submodules: true
-      - uses: actions/setup-node@v3
+      - uses: actions/setup-node@v4
         env:
           FORCE_COLOR: 0
         with:
@@ -779,7 +779,7 @@ jobs:
           echo "V4_DIR=$DIR" >> $GITHUB_ENV
           ghost install v4 --local -d $DIR
 
-      - uses: actions/setup-node@v3
+      - uses: actions/setup-node@v4
         env:
           FORCE_COLOR: 0
         with:
diff --git a/apps/admin-x-design-system/.eslintrc.cjs b/apps/admin-x-design-system/.eslintrc.cjs
new file mode 100644
index 00000000000..27d400ede58
--- /dev/null
+++ b/apps/admin-x-design-system/.eslintrc.cjs
@@ -0,0 +1,41 @@
+module.exports = {
+    extends: [
+        'plugin:ghost/ts',
+        'plugin:react/recommended',
+        'plugin:react-hooks/recommended'
+    ],
+    plugins: [
+        'ghost',
+        'react-refresh',
+        'tailwindcss'
+    ],
+    settings: {
+        react: {
+            version: 'detect'
+        }
+    },
+    rules: {
+        // suppress errors for missing 'import React' in JSX files, as we don't need it
+        'react/react-in-jsx-scope': 'off',
+        // ignore prop-types for now
+        'react/prop-types': 'off',
+
+        'react/jsx-sort-props': ['error', {
+            reservedFirst: true,
+            callbacksLast: true,
+            shorthandLast: true,
+            locale: 'en'
+        }],
+        'react/button-has-type': 'error',
+        'react/no-array-index-key': 'error',
+        'react/jsx-key': 'off',
+
+        'tailwindcss/classnames-order': ['error', {config: 'tailwind.config.cjs'}],
+        'tailwindcss/enforces-negative-arbitrary-values': ['warn', {config: 'tailwind.config.cjs'}],
+        'tailwindcss/enforces-shorthand': ['warn', {config: 'tailwind.config.cjs'}],
+        'tailwindcss/migration-from-tailwind-2': ['warn', {config: 'tailwind.config.cjs'}],
+        'tailwindcss/no-arbitrary-value': 'off',
+        'tailwindcss/no-custom-classname': 'off',
+        'tailwindcss/no-contradicting-classname': ['error', {config: 'tailwind.config.cjs'}]
+    }
+};
diff --git a/apps/admin-x-design-system/.gitignore b/apps/admin-x-design-system/.gitignore
new file mode 100644
index 00000000000..62ac7b71aa7
--- /dev/null
+++ b/apps/admin-x-design-system/.gitignore
@@ -0,0 +1,2 @@
+es
+types
diff --git a/apps/admin-x-settings/src/admin-x-ds/assets/fonts/Inter.ttf b/apps/admin-x-design-system/.storybook/Inter.ttf
similarity index 100%
rename from apps/admin-x-settings/src/admin-x-ds/assets/fonts/Inter.ttf
rename to apps/admin-x-design-system/.storybook/Inter.ttf
diff --git a/apps/admin-x-settings/.storybook/adminx-theme.tsx b/apps/admin-x-design-system/.storybook/adminx-theme.tsx
similarity index 100%
rename from apps/admin-x-settings/.storybook/adminx-theme.tsx
rename to apps/admin-x-design-system/.storybook/adminx-theme.tsx
diff --git a/apps/admin-x-settings/.storybook/main.tsx b/apps/admin-x-design-system/.storybook/main.tsx
similarity index 59%
rename from apps/admin-x-settings/.storybook/main.tsx
rename to apps/admin-x-design-system/.storybook/main.tsx
index c80dfe7b948..53b7664ef08 100644
--- a/apps/admin-x-settings/.storybook/main.tsx
+++ b/apps/admin-x-design-system/.storybook/main.tsx
@@ -1,5 +1,5 @@
-import {resolve} from "path";
 import type { StorybookConfig } from "@storybook/react-vite";
+
 const config: StorybookConfig = {
 	stories: ["../src/**/*.mdx", "../src/**/*.stories.@(js|jsx|ts|tsx)"],
 	addons: [
@@ -17,14 +17,11 @@ const config: StorybookConfig = {
 	docs: {
 		autodocs: "tag",
 	},
-	// staticDirs: ['../public/fonts'],
-	async viteFinal(config, options) {
-		config.resolve.alias = {
-			crypto: require.resolve('rollup-plugin-node-builtins'),
-			// @TODO: Remove this when @tryghost/nql is updated
-			mingo: resolve(__dirname, '../../../node_modules/mingo/dist/mingo.js')
+    async viteFinal(config, options) {
+		config.resolve!.alias = {
+			crypto: require.resolve('rollup-plugin-node-builtins')
 		}
 		return config;
-	},
+	}
 };
 export default config;
diff --git a/apps/admin-x-settings/.storybook/manager.tsx b/apps/admin-x-design-system/.storybook/manager.tsx
similarity index 100%
rename from apps/admin-x-settings/.storybook/manager.tsx
rename to apps/admin-x-design-system/.storybook/manager.tsx
diff --git a/apps/admin-x-settings/.storybook/preview.tsx b/apps/admin-x-design-system/.storybook/preview.tsx
similarity index 76%
rename from apps/admin-x-settings/.storybook/preview.tsx
rename to apps/admin-x-design-system/.storybook/preview.tsx
index 268a8befcda..6f1dfede995 100644
--- a/apps/admin-x-settings/.storybook/preview.tsx
+++ b/apps/admin-x-design-system/.storybook/preview.tsx
@@ -1,13 +1,11 @@
 import React from 'react';
 
-import '../src/styles/demo.css';
+import '../styles.css';
+import './storybook.css';
+
 import type { Preview } from "@storybook/react";
-import '../src/admin-x-ds/providers/DesignSystemProvider';
-import DesignSystemProvider from '../src/admin-x-ds/providers/DesignSystemProvider';
+import DesignSystemProvider from '../src/providers/DesignSystemProvider';
 import adminxTheme from './adminx-theme';
-import { themes } from '@storybook/theming';
-
-import '../src/admin-x-ds/assets/styles/storybook.css';
 
 const preview: Preview = {
 	parameters: {
@@ -33,12 +31,12 @@ const preview: Preview = {
 			let {scheme} = context.globals;
 
 			return (
-			<div className={`admin-x-settings ${scheme === 'dark' ? 'dark' : ''}`} style={{
+			<div className={`admin-x-design-system admin-x-base ${scheme === 'dark' ? 'dark' : ''}`} style={{
 				padding: '24px',
 				background: (scheme === 'dark' ? '#131416' : '')
 			}}>
 				{/* 👇 Decorators in Storybook also accept a function. Replace <Story/> with Story() to enable it  */}
-				<DesignSystemProvider>
+				<DesignSystemProvider fetchKoenigLexical={async () => {}}>
 					<Story />
 				</DesignSystemProvider>
 			</div>);
diff --git a/apps/admin-x-settings/src/admin-x-ds/assets/styles/storybook.css b/apps/admin-x-design-system/.storybook/storybook.css
similarity index 83%
rename from apps/admin-x-settings/src/admin-x-ds/assets/styles/storybook.css
rename to apps/admin-x-design-system/.storybook/storybook.css
index aecd9585204..062e7a1056b 100644
--- a/apps/admin-x-settings/src/admin-x-ds/assets/styles/storybook.css
+++ b/apps/admin-x-design-system/.storybook/storybook.css
@@ -1,3 +1,32 @@
+/*
+ * We load Inter in Ember admin, so loading it explicitly here makes the final rendering
+ * in Storybook match the final rendering when embedded in Ember
+ */
+@font-face {
+    font-family: "Inter";
+    src: url("./Inter.ttf") format("truetype-variations");
+    font-weight: 100 900;
+}
+
+:root {
+    font-size: 62.5%;
+    line-height: 1.5;
+    -ms-text-size-adjust: 100%;
+    -webkit-text-size-adjust: 100%;
+
+    text-rendering: optimizeLegibility;
+    -webkit-font-smoothing: antialiased;
+    -moz-osx-font-smoothing: grayscale;
+    -webkit-text-size-adjust: 100%;
+}
+
+html, body, #root {
+    width: 100%;
+    height: 100%;
+    margin: 0;
+    letter-spacing: unset;
+}
+
 .sbdocs-wrapper {
     padding: 3vmin !important;
 }
@@ -211,4 +240,4 @@
     display: grid;
     grid-template-columns: auto 240px;
     gap: 32px;
-}
\ No newline at end of file
+}
diff --git a/apps/admin-x-design-system/README.md b/apps/admin-x-design-system/README.md
new file mode 100644
index 00000000000..a76239c6f2d
--- /dev/null
+++ b/apps/admin-x-design-system/README.md
@@ -0,0 +1,23 @@
+# Admin X Design
+
+Components, design guidelines and documentation for building apps in Ghost Admin
+
+
+## Usage
+
+
+## Develop
+
+This is a monorepo package.
+
+Follow the instructions for the top-level repo.
+1. `git clone` this repo & `cd` into it as usual
+2. Run `yarn` to install top-level dependencies.
+
+
+
+## Test
+
+- `yarn lint` run just eslint
+- `yarn test` run lint and tests
+
diff --git a/apps/admin-x-design-system/package.json b/apps/admin-x-design-system/package.json
new file mode 100644
index 00000000000..263956fc957
--- /dev/null
+++ b/apps/admin-x-design-system/package.json
@@ -0,0 +1,75 @@
+{
+  "name": "@tryghost/admin-x-design-system",
+  "type": "module",
+  "version": "0.0.0",
+  "repository": "https://github.com/TryGhost/Ghost/tree/main/packages/admin-x-design-system",
+  "author": "Ghost Foundation",
+  "private": true,
+  "main": "es/index.js",
+  "types": "types/index.d.ts",
+  "sideEffects": false,
+  "scripts": {
+    "build": "vite build && tsc -p tsconfig.declaration.json",
+    "prepare": "yarn build",
+    "test": "yarn test:types",
+    "test:types": "tsc --noEmit",
+    "lint:code": "eslint --ext .js,.ts,.cjs,.tsx src/ --cache",
+    "lint": "yarn lint:code && yarn lint:test",
+    "lint:test": "eslint -c test/.eslintrc.cjs --ext .js,.ts,.cjs,.tsx test/ --cache",
+    "storybook": "storybook dev -p 6006",
+    "build-storybook": "storybook build"
+  },
+  "files": [
+    "es",
+    "types",
+    "tailwind.cjs",
+    "tailwind.config.cjs"
+  ],
+  "devDependencies": {
+    "@codemirror/lang-html": "^6.4.5",
+    "@storybook/addon-essentials": "7.4.0",
+    "@storybook/addon-interactions": "7.4.0",
+    "@storybook/addon-links": "7.4.0",
+    "@storybook/addon-styling": "1.3.7",
+    "@storybook/blocks": "7.4.0",
+    "@storybook/react": "7.4.0",
+    "@storybook/react-vite": "7.4.0",
+    "@storybook/testing-library": "0.2.2",
+    "@vitejs/plugin-react": "4.1.1",
+    "c8": "8.0.1",
+    "eslint-plugin-react-hooks": "4.6.0",
+    "eslint-plugin-react-refresh": "0.4.3",
+    "eslint-plugin-tailwindcss": "3.13.0",
+    "mocha": "10.2.0",
+    "rollup-plugin-node-builtins": "2.1.2",
+    "sinon": "17.0.0",
+    "ts-node": "10.9.1",
+    "react": "^18.2.0",
+    "react-dom": "^18.2.0",
+    "storybook": "7.4.0",
+    "typescript": "5.2.2",
+    "vite": "4.5.0",
+    "vite-plugin-svgr": "3.3.0"
+  },
+  "dependencies": {
+    "@dnd-kit/core": "6.0.8",
+    "@dnd-kit/sortable": "7.0.2",
+    "@ebay/nice-modal-react": "1.2.13",
+    "@sentry/react": "7.78.0",
+    "@tailwindcss/forms": "0.5.6",
+    "@tailwindcss/line-clamp": "0.4.4",
+    "@uiw/react-codemirror": "^4.21.9",
+    "autoprefixer": "10.4.16",
+    "clsx": "2.0.0",
+    "postcss": "8.4.31",
+    "postcss-import": "15.1.0",
+    "react-colorful": "^5.1.2",
+    "react-hot-toast": "2.4.1",
+    "react-select": "5.8.0",
+    "tailwindcss": "3.3.5"
+  },
+  "peerDependencies": {
+    "react": "^18.2.0",
+    "react-dom": "^18.2.0"
+  }
+}
diff --git a/apps/admin-x-design-system/postcss.config.js b/apps/admin-x-design-system/postcss.config.js
new file mode 100644
index 00000000000..3f15318da0b
--- /dev/null
+++ b/apps/admin-x-design-system/postcss.config.js
@@ -0,0 +1,8 @@
+export default {
+    plugins: {
+        'postcss-import': {},
+        'tailwindcss/nesting': {},
+        tailwindcss: {},
+        autoprefixer: {}
+    }
+};
diff --git a/apps/admin-x-settings/src/styles/preflight.css b/apps/admin-x-design-system/preflight.css
similarity index 99%
rename from apps/admin-x-settings/src/styles/preflight.css
rename to apps/admin-x-design-system/preflight.css
index ff179a06507..894cd6629a7 100644
--- a/apps/admin-x-settings/src/styles/preflight.css
+++ b/apps/admin-x-design-system/preflight.css
@@ -1,5 +1,4 @@
-.admin-x-settings {
-
+.admin-x-base {
     /*
     1. Prevent padding and border from affecting element width. (https://github.com/mozdevs/cssremedy/issues/4)
     2. Allow adding a border to an element by just adding a border-width. (https://github.com/tailwindcss/tailwindcss/pull/116)
@@ -329,7 +328,7 @@
     input::placeholder,
     textarea::placeholder {
         opacity: 1; /* 1 */
-        color: theme('colors.grey.500'); /* 2 */
+        @apply text-grey-500; /* 2 */
     }
 
     button:focus-visible,
@@ -364,5 +363,4 @@
         max-width: 100%;
         height: auto;
     }
-
-}
\ No newline at end of file
+}
diff --git a/apps/admin-x-settings/src/admin-x-ds/Boilerplate.stories.tsx b/apps/admin-x-design-system/src/Boilerplate.stories.tsx
similarity index 100%
rename from apps/admin-x-settings/src/admin-x-ds/Boilerplate.stories.tsx
rename to apps/admin-x-design-system/src/Boilerplate.stories.tsx
diff --git a/apps/admin-x-settings/src/admin-x-ds/Boilerplate.tsx b/apps/admin-x-design-system/src/Boilerplate.tsx
similarity index 100%
rename from apps/admin-x-settings/src/admin-x-ds/Boilerplate.tsx
rename to apps/admin-x-design-system/src/Boilerplate.tsx
diff --git a/apps/admin-x-design-system/src/DesignSystemApp.tsx b/apps/admin-x-design-system/src/DesignSystemApp.tsx
new file mode 100644
index 00000000000..6606867af16
--- /dev/null
+++ b/apps/admin-x-design-system/src/DesignSystemApp.tsx
@@ -0,0 +1,27 @@
+import clsx from 'clsx';
+import React from 'react';
+import {FetchKoenigLexical} from './global/form/HtmlEditor';
+import DesignSystemProvider from './providers/DesignSystemProvider';
+
+export interface DesignSystemAppProps extends React.HTMLProps<HTMLDivElement> {
+    darkMode: boolean;
+    fetchKoenigLexical: FetchKoenigLexical;
+}
+
+const DesignSystemApp: React.FC<DesignSystemAppProps> = ({darkMode, fetchKoenigLexical, className, children, ...props}) => {
+    const appClassName = clsx(
+        'admin-x-base',
+        darkMode && 'dark',
+        className
+    );
+
+    return (
+        <div className={appClassName} {...props}>
+            <DesignSystemProvider fetchKoenigLexical={fetchKoenigLexical}>
+                {children}
+            </DesignSystemProvider>
+        </div>
+    );
+};
+
+export default DesignSystemApp;
diff --git a/apps/admin-x-settings/src/admin-x-ds/assets/icons/add.svg b/apps/admin-x-design-system/src/assets/icons/add.svg
similarity index 100%
rename from apps/admin-x-settings/src/admin-x-ds/assets/icons/add.svg
rename to apps/admin-x-design-system/src/assets/icons/add.svg
diff --git a/apps/admin-x-settings/src/admin-x-ds/assets/icons/align-center.svg b/apps/admin-x-design-system/src/assets/icons/align-center.svg
similarity index 100%
rename from apps/admin-x-settings/src/admin-x-ds/assets/icons/align-center.svg
rename to apps/admin-x-design-system/src/assets/icons/align-center.svg
diff --git a/apps/admin-x-settings/src/admin-x-ds/assets/icons/align-left.svg b/apps/admin-x-design-system/src/assets/icons/align-left.svg
similarity index 100%
rename from apps/admin-x-settings/src/admin-x-ds/assets/icons/align-left.svg
rename to apps/admin-x-design-system/src/assets/icons/align-left.svg
diff --git a/apps/admin-x-settings/src/admin-x-ds/assets/icons/angle-brackets.svg b/apps/admin-x-design-system/src/assets/icons/angle-brackets.svg
similarity index 100%
rename from apps/admin-x-settings/src/admin-x-ds/assets/icons/angle-brackets.svg
rename to apps/admin-x-design-system/src/assets/icons/angle-brackets.svg
diff --git a/apps/admin-x-settings/src/admin-x-ds/assets/icons/arrow-bottom-left.svg b/apps/admin-x-design-system/src/assets/icons/arrow-bottom-left.svg
similarity index 100%
rename from apps/admin-x-settings/src/admin-x-ds/assets/icons/arrow-bottom-left.svg
rename to apps/admin-x-design-system/src/assets/icons/arrow-bottom-left.svg
diff --git a/apps/admin-x-settings/src/admin-x-ds/assets/icons/arrow-bottom-right.svg b/apps/admin-x-design-system/src/assets/icons/arrow-bottom-right.svg
similarity index 100%
rename from apps/admin-x-settings/src/admin-x-ds/assets/icons/arrow-bottom-right.svg
rename to apps/admin-x-design-system/src/assets/icons/arrow-bottom-right.svg
diff --git a/apps/admin-x-settings/src/admin-x-ds/assets/icons/arrow-down.svg b/apps/admin-x-design-system/src/assets/icons/arrow-down.svg
similarity index 100%
rename from apps/admin-x-settings/src/admin-x-ds/assets/icons/arrow-down.svg
rename to apps/admin-x-design-system/src/assets/icons/arrow-down.svg
diff --git a/apps/admin-x-settings/src/admin-x-ds/assets/icons/arrow-left.svg b/apps/admin-x-design-system/src/assets/icons/arrow-left.svg
similarity index 100%
rename from apps/admin-x-settings/src/admin-x-ds/assets/icons/arrow-left.svg
rename to apps/admin-x-design-system/src/assets/icons/arrow-left.svg
diff --git a/apps/admin-x-settings/src/admin-x-ds/assets/icons/arrow-right.svg b/apps/admin-x-design-system/src/assets/icons/arrow-right.svg
similarity index 100%
rename from apps/admin-x-settings/src/admin-x-ds/assets/icons/arrow-right.svg
rename to apps/admin-x-design-system/src/assets/icons/arrow-right.svg
diff --git a/apps/admin-x-settings/src/admin-x-ds/assets/icons/arrow-top-left.svg b/apps/admin-x-design-system/src/assets/icons/arrow-top-left.svg
similarity index 100%
rename from apps/admin-x-settings/src/admin-x-ds/assets/icons/arrow-top-left.svg
rename to apps/admin-x-design-system/src/assets/icons/arrow-top-left.svg
diff --git a/apps/admin-x-settings/src/admin-x-ds/assets/icons/arrow-top-right.svg b/apps/admin-x-design-system/src/assets/icons/arrow-top-right.svg
similarity index 100%
rename from apps/admin-x-settings/src/admin-x-ds/assets/icons/arrow-top-right.svg
rename to apps/admin-x-design-system/src/assets/icons/arrow-top-right.svg
diff --git a/apps/admin-x-settings/src/admin-x-ds/assets/icons/arrow-up.svg b/apps/admin-x-design-system/src/assets/icons/arrow-up.svg
similarity index 100%
rename from apps/admin-x-settings/src/admin-x-ds/assets/icons/arrow-up.svg
rename to apps/admin-x-design-system/src/assets/icons/arrow-up.svg
diff --git a/apps/admin-x-settings/src/admin-x-ds/assets/icons/at-sign.svg b/apps/admin-x-design-system/src/assets/icons/at-sign.svg
similarity index 100%
rename from apps/admin-x-settings/src/admin-x-ds/assets/icons/at-sign.svg
rename to apps/admin-x-design-system/src/assets/icons/at-sign.svg
diff --git a/apps/admin-x-settings/src/admin-x-ds/assets/icons/baseline-chart.svg b/apps/admin-x-design-system/src/assets/icons/baseline-chart.svg
similarity index 100%
rename from apps/admin-x-settings/src/admin-x-ds/assets/icons/baseline-chart.svg
rename to apps/admin-x-design-system/src/assets/icons/baseline-chart.svg
diff --git a/apps/admin-x-settings/src/admin-x-ds/assets/icons/bills.svg b/apps/admin-x-design-system/src/assets/icons/bills.svg
similarity index 100%
rename from apps/admin-x-settings/src/admin-x-ds/assets/icons/bills.svg
rename to apps/admin-x-design-system/src/assets/icons/bills.svg
diff --git a/apps/admin-x-settings/src/admin-x-ds/assets/icons/book-open.svg b/apps/admin-x-design-system/src/assets/icons/book-open.svg
similarity index 100%
rename from apps/admin-x-settings/src/admin-x-ds/assets/icons/book-open.svg
rename to apps/admin-x-design-system/src/assets/icons/book-open.svg
diff --git a/apps/admin-x-settings/src/admin-x-ds/assets/icons/brackets.svg b/apps/admin-x-design-system/src/assets/icons/brackets.svg
similarity index 100%
rename from apps/admin-x-settings/src/admin-x-ds/assets/icons/brackets.svg
rename to apps/admin-x-design-system/src/assets/icons/brackets.svg
diff --git a/apps/admin-x-settings/src/admin-x-ds/assets/icons/check-circle.svg b/apps/admin-x-design-system/src/assets/icons/check-circle.svg
similarity index 100%
rename from apps/admin-x-settings/src/admin-x-ds/assets/icons/check-circle.svg
rename to apps/admin-x-design-system/src/assets/icons/check-circle.svg
diff --git a/apps/admin-x-settings/src/admin-x-ds/assets/icons/check.svg b/apps/admin-x-design-system/src/assets/icons/check.svg
similarity index 100%
rename from apps/admin-x-settings/src/admin-x-ds/assets/icons/check.svg
rename to apps/admin-x-design-system/src/assets/icons/check.svg
diff --git a/apps/admin-x-settings/src/admin-x-ds/assets/icons/chevron-down.svg b/apps/admin-x-design-system/src/assets/icons/chevron-down.svg
similarity index 100%
rename from apps/admin-x-settings/src/admin-x-ds/assets/icons/chevron-down.svg
rename to apps/admin-x-design-system/src/assets/icons/chevron-down.svg
diff --git a/apps/admin-x-settings/src/admin-x-ds/assets/icons/chevron-left.svg b/apps/admin-x-design-system/src/assets/icons/chevron-left.svg
similarity index 100%
rename from apps/admin-x-settings/src/admin-x-ds/assets/icons/chevron-left.svg
rename to apps/admin-x-design-system/src/assets/icons/chevron-left.svg
diff --git a/apps/admin-x-settings/src/admin-x-ds/assets/icons/chevron-right.svg b/apps/admin-x-design-system/src/assets/icons/chevron-right.svg
similarity index 100%
rename from apps/admin-x-settings/src/admin-x-ds/assets/icons/chevron-right.svg
rename to apps/admin-x-design-system/src/assets/icons/chevron-right.svg
diff --git a/apps/admin-x-settings/src/admin-x-ds/assets/icons/chevron-up.svg b/apps/admin-x-design-system/src/assets/icons/chevron-up.svg
similarity index 100%
rename from apps/admin-x-settings/src/admin-x-ds/assets/icons/chevron-up.svg
rename to apps/admin-x-design-system/src/assets/icons/chevron-up.svg
diff --git a/apps/admin-x-settings/src/admin-x-ds/assets/icons/close.svg b/apps/admin-x-design-system/src/assets/icons/close.svg
similarity index 100%
rename from apps/admin-x-settings/src/admin-x-ds/assets/icons/close.svg
rename to apps/admin-x-design-system/src/assets/icons/close.svg
diff --git a/apps/admin-x-settings/src/admin-x-ds/assets/icons/comment.svg b/apps/admin-x-design-system/src/assets/icons/comment.svg
similarity index 100%
rename from apps/admin-x-settings/src/admin-x-ds/assets/icons/comment.svg
rename to apps/admin-x-design-system/src/assets/icons/comment.svg
diff --git a/apps/admin-x-settings/src/admin-x-ds/assets/icons/crown.svg b/apps/admin-x-design-system/src/assets/icons/crown.svg
similarity index 100%
rename from apps/admin-x-settings/src/admin-x-ds/assets/icons/crown.svg
rename to apps/admin-x-design-system/src/assets/icons/crown.svg
diff --git a/apps/admin-x-design-system/src/assets/icons/discount.svg b/apps/admin-x-design-system/src/assets/icons/discount.svg
new file mode 100644
index 00000000000..5d5ef793b09
--- /dev/null
+++ b/apps/admin-x-design-system/src/assets/icons/discount.svg
@@ -0,0 +1 @@
+<svg viewBox="-0.75 -0.75 24 24" xmlns="http://www.w3.org/2000/svg" height="24" width="24"><path d="m2.109375 20.390625 18.28125 -18.28125Z" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5"></path><path d="M14.765625 17.578125a2.8125 2.8125 0 1 0 5.625 0 2.8125 2.8125 0 1 0 -5.625 0Z" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5"></path><path d="M2.109375 4.921875a2.8125 2.8125 0 1 0 5.625 0 2.8125 2.8125 0 1 0 -5.625 0Z" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5"></path></svg>
diff --git a/apps/admin-x-settings/src/admin-x-ds/assets/icons/duplicate.svg b/apps/admin-x-design-system/src/assets/icons/duplicate.svg
similarity index 100%
rename from apps/admin-x-settings/src/admin-x-ds/assets/icons/duplicate.svg
rename to apps/admin-x-design-system/src/assets/icons/duplicate.svg
diff --git a/apps/admin-x-settings/src/admin-x-ds/assets/icons/ellipsis.svg b/apps/admin-x-design-system/src/assets/icons/ellipsis.svg
similarity index 100%
rename from apps/admin-x-settings/src/admin-x-ds/assets/icons/ellipsis.svg
rename to apps/admin-x-design-system/src/assets/icons/ellipsis.svg
diff --git a/apps/admin-x-settings/src/admin-x-ds/assets/icons/email-check.svg b/apps/admin-x-design-system/src/assets/icons/email-check.svg
similarity index 100%
rename from apps/admin-x-settings/src/admin-x-ds/assets/icons/email-check.svg
rename to apps/admin-x-design-system/src/assets/icons/email-check.svg
diff --git a/apps/admin-x-settings/src/admin-x-ds/assets/icons/email.svg b/apps/admin-x-design-system/src/assets/icons/email.svg
similarity index 100%
rename from apps/admin-x-settings/src/admin-x-ds/assets/icons/email.svg
rename to apps/admin-x-design-system/src/assets/icons/email.svg
diff --git a/apps/admin-x-settings/src/admin-x-ds/assets/icons/emailfield.svg b/apps/admin-x-design-system/src/assets/icons/emailfield.svg
similarity index 100%
rename from apps/admin-x-settings/src/admin-x-ds/assets/icons/emailfield.svg
rename to apps/admin-x-design-system/src/assets/icons/emailfield.svg
diff --git a/apps/admin-x-settings/src/admin-x-ds/assets/icons/eyedropper.svg b/apps/admin-x-design-system/src/assets/icons/eyedropper.svg
similarity index 100%
rename from apps/admin-x-settings/src/admin-x-ds/assets/icons/eyedropper.svg
rename to apps/admin-x-design-system/src/assets/icons/eyedropper.svg
diff --git a/apps/admin-x-settings/src/admin-x-ds/assets/icons/facebook.svg b/apps/admin-x-design-system/src/assets/icons/facebook.svg
similarity index 100%
rename from apps/admin-x-settings/src/admin-x-ds/assets/icons/facebook.svg
rename to apps/admin-x-design-system/src/assets/icons/facebook.svg
diff --git a/apps/admin-x-settings/src/admin-x-ds/assets/icons/finger-up.svg b/apps/admin-x-design-system/src/assets/icons/finger-up.svg
similarity index 100%
rename from apps/admin-x-settings/src/admin-x-ds/assets/icons/finger-up.svg
rename to apps/admin-x-design-system/src/assets/icons/finger-up.svg
diff --git a/apps/admin-x-settings/src/admin-x-ds/assets/icons/hamburger.svg b/apps/admin-x-design-system/src/assets/icons/hamburger.svg
similarity index 100%
rename from apps/admin-x-settings/src/admin-x-ds/assets/icons/hamburger.svg
rename to apps/admin-x-design-system/src/assets/icons/hamburger.svg
diff --git a/apps/admin-x-settings/src/admin-x-ds/assets/icons/heart.svg b/apps/admin-x-design-system/src/assets/icons/heart.svg
similarity index 100%
rename from apps/admin-x-settings/src/admin-x-ds/assets/icons/heart.svg
rename to apps/admin-x-design-system/src/assets/icons/heart.svg
diff --git a/apps/admin-x-settings/src/admin-x-ds/assets/icons/integration.svg b/apps/admin-x-design-system/src/assets/icons/integration.svg
similarity index 100%
rename from apps/admin-x-settings/src/admin-x-ds/assets/icons/integration.svg
rename to apps/admin-x-design-system/src/assets/icons/integration.svg
diff --git a/apps/admin-x-settings/src/admin-x-ds/assets/icons/key.svg b/apps/admin-x-design-system/src/assets/icons/key.svg
similarity index 100%
rename from apps/admin-x-settings/src/admin-x-ds/assets/icons/key.svg
rename to apps/admin-x-design-system/src/assets/icons/key.svg
diff --git a/apps/admin-x-settings/src/admin-x-ds/assets/icons/labs-flask.svg b/apps/admin-x-design-system/src/assets/icons/labs-flask.svg
similarity index 100%
rename from apps/admin-x-settings/src/admin-x-ds/assets/icons/labs-flask.svg
rename to apps/admin-x-design-system/src/assets/icons/labs-flask.svg
diff --git a/apps/admin-x-settings/src/admin-x-ds/assets/icons/language.svg b/apps/admin-x-design-system/src/assets/icons/language.svg
similarity index 100%
rename from apps/admin-x-settings/src/admin-x-ds/assets/icons/language.svg
rename to apps/admin-x-design-system/src/assets/icons/language.svg
diff --git a/apps/admin-x-settings/src/admin-x-ds/assets/icons/laptop.svg b/apps/admin-x-design-system/src/assets/icons/laptop.svg
similarity index 100%
rename from apps/admin-x-settings/src/admin-x-ds/assets/icons/laptop.svg
rename to apps/admin-x-design-system/src/assets/icons/laptop.svg
diff --git a/apps/admin-x-settings/src/admin-x-ds/assets/icons/layer.svg b/apps/admin-x-design-system/src/assets/icons/layer.svg
similarity index 100%
rename from apps/admin-x-settings/src/admin-x-ds/assets/icons/layer.svg
rename to apps/admin-x-design-system/src/assets/icons/layer.svg
diff --git a/apps/admin-x-settings/src/admin-x-ds/assets/icons/like.svg b/apps/admin-x-design-system/src/assets/icons/like.svg
similarity index 100%
rename from apps/admin-x-settings/src/admin-x-ds/assets/icons/like.svg
rename to apps/admin-x-design-system/src/assets/icons/like.svg
diff --git a/apps/admin-x-settings/src/admin-x-ds/assets/icons/link-broken.svg b/apps/admin-x-design-system/src/assets/icons/link-broken.svg
similarity index 100%
rename from apps/admin-x-settings/src/admin-x-ds/assets/icons/link-broken.svg
rename to apps/admin-x-design-system/src/assets/icons/link-broken.svg
diff --git a/apps/admin-x-settings/src/admin-x-ds/assets/icons/lock-locked.svg b/apps/admin-x-design-system/src/assets/icons/lock-locked.svg
similarity index 100%
rename from apps/admin-x-settings/src/admin-x-ds/assets/icons/lock-locked.svg
rename to apps/admin-x-design-system/src/assets/icons/lock-locked.svg
diff --git a/apps/admin-x-settings/src/admin-x-ds/assets/icons/lock-unlocked.svg b/apps/admin-x-design-system/src/assets/icons/lock-unlocked.svg
similarity index 100%
rename from apps/admin-x-settings/src/admin-x-ds/assets/icons/lock-unlocked.svg
rename to apps/admin-x-design-system/src/assets/icons/lock-unlocked.svg
diff --git a/apps/admin-x-settings/src/admin-x-ds/assets/icons/magnifying-glass.svg b/apps/admin-x-design-system/src/assets/icons/magnifying-glass.svg
similarity index 100%
rename from apps/admin-x-settings/src/admin-x-ds/assets/icons/magnifying-glass.svg
rename to apps/admin-x-design-system/src/assets/icons/magnifying-glass.svg
diff --git a/apps/admin-x-settings/src/admin-x-ds/assets/icons/mail-block.svg b/apps/admin-x-design-system/src/assets/icons/mail-block.svg
similarity index 100%
rename from apps/admin-x-settings/src/admin-x-ds/assets/icons/mail-block.svg
rename to apps/admin-x-design-system/src/assets/icons/mail-block.svg
diff --git a/apps/admin-x-settings/src/admin-x-ds/assets/icons/megaphone.svg b/apps/admin-x-design-system/src/assets/icons/megaphone.svg
similarity index 100%
rename from apps/admin-x-settings/src/admin-x-ds/assets/icons/megaphone.svg
rename to apps/admin-x-design-system/src/assets/icons/megaphone.svg
diff --git a/apps/admin-x-settings/src/admin-x-ds/assets/icons/mobile.svg b/apps/admin-x-design-system/src/assets/icons/mobile.svg
similarity index 100%
rename from apps/admin-x-settings/src/admin-x-ds/assets/icons/mobile.svg
rename to apps/admin-x-design-system/src/assets/icons/mobile.svg
diff --git a/apps/admin-x-settings/src/admin-x-ds/assets/icons/modules-3.svg b/apps/admin-x-design-system/src/assets/icons/modules-3.svg
similarity index 100%
rename from apps/admin-x-settings/src/admin-x-ds/assets/icons/modules-3.svg
rename to apps/admin-x-design-system/src/assets/icons/modules-3.svg
diff --git a/apps/admin-x-settings/src/admin-x-ds/assets/icons/money-bags.svg b/apps/admin-x-design-system/src/assets/icons/money-bags.svg
similarity index 100%
rename from apps/admin-x-settings/src/admin-x-ds/assets/icons/money-bags.svg
rename to apps/admin-x-design-system/src/assets/icons/money-bags.svg
diff --git a/apps/admin-x-settings/src/admin-x-ds/assets/icons/navigation.svg b/apps/admin-x-design-system/src/assets/icons/navigation.svg
similarity index 100%
rename from apps/admin-x-settings/src/admin-x-ds/assets/icons/navigation.svg
rename to apps/admin-x-design-system/src/assets/icons/navigation.svg
diff --git a/apps/admin-x-settings/src/admin-x-ds/assets/icons/palette.svg b/apps/admin-x-design-system/src/assets/icons/palette.svg
similarity index 100%
rename from apps/admin-x-settings/src/admin-x-ds/assets/icons/palette.svg
rename to apps/admin-x-design-system/src/assets/icons/palette.svg
diff --git a/apps/admin-x-settings/src/admin-x-ds/assets/icons/pen.svg b/apps/admin-x-design-system/src/assets/icons/pen.svg
similarity index 100%
rename from apps/admin-x-settings/src/admin-x-ds/assets/icons/pen.svg
rename to apps/admin-x-design-system/src/assets/icons/pen.svg
diff --git a/apps/admin-x-settings/src/admin-x-ds/assets/icons/picture.svg b/apps/admin-x-design-system/src/assets/icons/picture.svg
similarity index 100%
rename from apps/admin-x-settings/src/admin-x-ds/assets/icons/picture.svg
rename to apps/admin-x-design-system/src/assets/icons/picture.svg
diff --git a/apps/admin-x-settings/src/admin-x-ds/assets/icons/piggybank.svg b/apps/admin-x-design-system/src/assets/icons/piggybank.svg
similarity index 100%
rename from apps/admin-x-settings/src/admin-x-ds/assets/icons/piggybank.svg
rename to apps/admin-x-design-system/src/assets/icons/piggybank.svg
diff --git a/apps/admin-x-settings/src/admin-x-ds/assets/icons/portal.svg b/apps/admin-x-design-system/src/assets/icons/portal.svg
similarity index 100%
rename from apps/admin-x-settings/src/admin-x-ds/assets/icons/portal.svg
rename to apps/admin-x-design-system/src/assets/icons/portal.svg
diff --git a/apps/admin-x-settings/src/admin-x-ds/assets/icons/question-circle.svg b/apps/admin-x-design-system/src/assets/icons/question-circle.svg
similarity index 100%
rename from apps/admin-x-settings/src/admin-x-ds/assets/icons/question-circle.svg
rename to apps/admin-x-design-system/src/assets/icons/question-circle.svg
diff --git a/apps/admin-x-settings/src/admin-x-ds/assets/icons/recepients.svg b/apps/admin-x-design-system/src/assets/icons/recepients.svg
similarity index 100%
rename from apps/admin-x-settings/src/admin-x-ds/assets/icons/recepients.svg
rename to apps/admin-x-design-system/src/assets/icons/recepients.svg
diff --git a/apps/admin-x-settings/src/admin-x-ds/assets/icons/single-user-block.svg b/apps/admin-x-design-system/src/assets/icons/single-user-block.svg
similarity index 100%
rename from apps/admin-x-settings/src/admin-x-ds/assets/icons/single-user-block.svg
rename to apps/admin-x-design-system/src/assets/icons/single-user-block.svg
diff --git a/apps/admin-x-settings/src/admin-x-ds/assets/icons/single-user-fill.svg b/apps/admin-x-design-system/src/assets/icons/single-user-fill.svg
similarity index 100%
rename from apps/admin-x-settings/src/admin-x-ds/assets/icons/single-user-fill.svg
rename to apps/admin-x-design-system/src/assets/icons/single-user-fill.svg
diff --git a/apps/admin-x-settings/src/admin-x-ds/assets/icons/textfield.svg b/apps/admin-x-design-system/src/assets/icons/textfield.svg
similarity index 100%
rename from apps/admin-x-settings/src/admin-x-ds/assets/icons/textfield.svg
rename to apps/admin-x-design-system/src/assets/icons/textfield.svg
diff --git a/apps/admin-x-settings/src/admin-x-ds/assets/icons/thumbs-down.svg b/apps/admin-x-design-system/src/assets/icons/thumbs-down.svg
similarity index 100%
rename from apps/admin-x-settings/src/admin-x-ds/assets/icons/thumbs-down.svg
rename to apps/admin-x-design-system/src/assets/icons/thumbs-down.svg
diff --git a/apps/admin-x-settings/src/admin-x-ds/assets/icons/thumbs-up.svg b/apps/admin-x-design-system/src/assets/icons/thumbs-up.svg
similarity index 100%
rename from apps/admin-x-settings/src/admin-x-ds/assets/icons/thumbs-up.svg
rename to apps/admin-x-design-system/src/assets/icons/thumbs-up.svg
diff --git a/apps/admin-x-settings/src/admin-x-ds/assets/icons/time-back.svg b/apps/admin-x-design-system/src/assets/icons/time-back.svg
similarity index 100%
rename from apps/admin-x-settings/src/admin-x-ds/assets/icons/time-back.svg
rename to apps/admin-x-design-system/src/assets/icons/time-back.svg
diff --git a/apps/admin-x-settings/src/admin-x-ds/assets/icons/trash.svg b/apps/admin-x-design-system/src/assets/icons/trash.svg
similarity index 100%
rename from apps/admin-x-settings/src/admin-x-ds/assets/icons/trash.svg
rename to apps/admin-x-design-system/src/assets/icons/trash.svg
diff --git a/apps/admin-x-settings/src/admin-x-ds/assets/icons/twitter-x.svg b/apps/admin-x-design-system/src/assets/icons/twitter-x.svg
similarity index 100%
rename from apps/admin-x-settings/src/admin-x-ds/assets/icons/twitter-x.svg
rename to apps/admin-x-design-system/src/assets/icons/twitter-x.svg
diff --git a/apps/admin-x-settings/src/admin-x-ds/assets/icons/unsplash-logo.svg b/apps/admin-x-design-system/src/assets/icons/unsplash-logo.svg
similarity index 100%
rename from apps/admin-x-settings/src/admin-x-ds/assets/icons/unsplash-logo.svg
rename to apps/admin-x-design-system/src/assets/icons/unsplash-logo.svg
diff --git a/apps/admin-x-settings/src/admin-x-ds/assets/icons/upload.svg b/apps/admin-x-design-system/src/assets/icons/upload.svg
similarity index 100%
rename from apps/admin-x-settings/src/admin-x-ds/assets/icons/upload.svg
rename to apps/admin-x-design-system/src/assets/icons/upload.svg
diff --git a/apps/admin-x-settings/src/admin-x-ds/assets/icons/user-add.svg b/apps/admin-x-design-system/src/assets/icons/user-add.svg
similarity index 100%
rename from apps/admin-x-settings/src/admin-x-ds/assets/icons/user-add.svg
rename to apps/admin-x-design-system/src/assets/icons/user-add.svg
diff --git a/apps/admin-x-settings/src/admin-x-ds/assets/icons/user-page.svg b/apps/admin-x-design-system/src/assets/icons/user-page.svg
similarity index 100%
rename from apps/admin-x-settings/src/admin-x-ds/assets/icons/user-page.svg
rename to apps/admin-x-design-system/src/assets/icons/user-page.svg
diff --git a/apps/admin-x-settings/src/admin-x-ds/assets/icons/warning.svg b/apps/admin-x-design-system/src/assets/icons/warning.svg
similarity index 100%
rename from apps/admin-x-settings/src/admin-x-ds/assets/icons/warning.svg
rename to apps/admin-x-design-system/src/assets/icons/warning.svg
diff --git a/apps/admin-x-settings/src/admin-x-ds/assets/icons/world-clock.svg b/apps/admin-x-design-system/src/assets/icons/world-clock.svg
similarity index 100%
rename from apps/admin-x-settings/src/admin-x-ds/assets/icons/world-clock.svg
rename to apps/admin-x-design-system/src/assets/icons/world-clock.svg
diff --git a/apps/admin-x-settings/src/admin-x-ds/assets/images/facebook-logo.svg b/apps/admin-x-design-system/src/assets/images/facebook-logo.svg
similarity index 100%
rename from apps/admin-x-settings/src/admin-x-ds/assets/images/facebook-logo.svg
rename to apps/admin-x-design-system/src/assets/images/facebook-logo.svg
diff --git a/apps/admin-x-settings/src/admin-x-ds/assets/images/ghost-logo.svg b/apps/admin-x-design-system/src/assets/images/ghost-logo.svg
similarity index 100%
rename from apps/admin-x-settings/src/admin-x-ds/assets/images/ghost-logo.svg
rename to apps/admin-x-design-system/src/assets/images/ghost-logo.svg
diff --git a/apps/admin-x-settings/src/admin-x-ds/assets/images/ghost-orb.svg b/apps/admin-x-design-system/src/assets/images/ghost-orb.svg
similarity index 100%
rename from apps/admin-x-settings/src/admin-x-ds/assets/images/ghost-orb.svg
rename to apps/admin-x-design-system/src/assets/images/ghost-orb.svg
diff --git a/apps/admin-x-settings/src/admin-x-ds/assets/images/google-logo.svg b/apps/admin-x-design-system/src/assets/images/google-logo.svg
similarity index 100%
rename from apps/admin-x-settings/src/admin-x-ds/assets/images/google-logo.svg
rename to apps/admin-x-design-system/src/assets/images/google-logo.svg
diff --git a/apps/admin-x-settings/src/admin-x-ds/assets/images/twitter-logo.svg b/apps/admin-x-design-system/src/assets/images/twitter-logo.svg
similarity index 100%
rename from apps/admin-x-settings/src/admin-x-ds/assets/images/twitter-logo.svg
rename to apps/admin-x-design-system/src/assets/images/twitter-logo.svg
diff --git a/apps/admin-x-settings/src/admin-x-ds/assets/images/x-logo.svg b/apps/admin-x-design-system/src/assets/images/x-logo.svg
similarity index 100%
rename from apps/admin-x-settings/src/admin-x-ds/assets/images/x-logo.svg
rename to apps/admin-x-design-system/src/assets/images/x-logo.svg
diff --git a/apps/admin-x-settings/src/admin-x-ds/docs/Colors.mdx b/apps/admin-x-design-system/src/docs/Colors.mdx
similarity index 100%
rename from apps/admin-x-settings/src/admin-x-ds/docs/Colors.mdx
rename to apps/admin-x-design-system/src/docs/Colors.mdx
diff --git a/apps/admin-x-settings/src/admin-x-ds/docs/ErrorHandling.mdx b/apps/admin-x-design-system/src/docs/ErrorHandling.mdx
similarity index 100%
rename from apps/admin-x-settings/src/admin-x-ds/docs/ErrorHandling.mdx
rename to apps/admin-x-design-system/src/docs/ErrorHandling.mdx
diff --git a/apps/admin-x-settings/src/admin-x-ds/docs/Icons.mdx b/apps/admin-x-design-system/src/docs/Icons.mdx
similarity index 100%
rename from apps/admin-x-settings/src/admin-x-ds/docs/Icons.mdx
rename to apps/admin-x-design-system/src/docs/Icons.mdx
diff --git a/apps/admin-x-settings/src/admin-x-ds/docs/Welcome.mdx b/apps/admin-x-design-system/src/docs/Welcome.mdx
similarity index 85%
rename from apps/admin-x-settings/src/admin-x-ds/docs/Welcome.mdx
rename to apps/admin-x-design-system/src/docs/Welcome.mdx
index 6d5c1180e49..68670193752 100644
--- a/apps/admin-x-settings/src/admin-x-ds/docs/Welcome.mdx
+++ b/apps/admin-x-design-system/src/docs/Welcome.mdx
@@ -14,8 +14,6 @@ import AppsIcon from './assets/apps.svg';
 
 <p className='excerpt'>Here you can find our design guidelines, component documentation, and resources for building apps in Ghost Admin.</p>
 
-<div className="highlight purple"><strong>This is a work in progress.</strong> As of today, the Storybook system is part of <a href="https://github.com/TryGhost/Ghost/tree/main/apps/admin-x-settings">AdminX Settings app</a> but it's about to be a separated into its own package.</div>
-
 ### What's inside
 
 The AdminX Design System is a collection of React UI building blocks for designers and developers to create apps for Ghost Admin. Its main purpose is to provide a library of available components and maintain consistency across the whole product.
@@ -46,4 +44,4 @@ The system uses Storybook — if you're new to it, we recommend reading about w
 <br/><br/>
 
 
-</div>
\ No newline at end of file
+</div>
diff --git a/apps/admin-x-settings/src/admin-x-ds/docs/assets/adminx-screenshot.png b/apps/admin-x-design-system/src/docs/assets/adminx-screenshot.png
similarity index 100%
rename from apps/admin-x-settings/src/admin-x-ds/docs/assets/adminx-screenshot.png
rename to apps/admin-x-design-system/src/docs/assets/adminx-screenshot.png
diff --git a/apps/admin-x-settings/src/admin-x-ds/docs/assets/apps.svg b/apps/admin-x-design-system/src/docs/assets/apps.svg
similarity index 100%
rename from apps/admin-x-settings/src/admin-x-ds/docs/assets/apps.svg
rename to apps/admin-x-design-system/src/docs/assets/apps.svg
diff --git a/apps/admin-x-settings/src/admin-x-ds/docs/assets/blocks.svg b/apps/admin-x-design-system/src/docs/assets/blocks.svg
similarity index 100%
rename from apps/admin-x-settings/src/admin-x-ds/docs/assets/blocks.svg
rename to apps/admin-x-design-system/src/docs/assets/blocks.svg
diff --git a/apps/admin-x-settings/src/admin-x-ds/docs/assets/circle-menu.svg b/apps/admin-x-design-system/src/docs/assets/circle-menu.svg
similarity index 100%
rename from apps/admin-x-settings/src/admin-x-ds/docs/assets/circle-menu.svg
rename to apps/admin-x-design-system/src/docs/assets/circle-menu.svg
diff --git a/apps/admin-x-settings/src/admin-x-ds/docs/assets/code-brackets.svg b/apps/admin-x-design-system/src/docs/assets/code-brackets.svg
similarity index 100%
rename from apps/admin-x-settings/src/admin-x-ds/docs/assets/code-brackets.svg
rename to apps/admin-x-design-system/src/docs/assets/code-brackets.svg
diff --git a/apps/admin-x-settings/src/admin-x-ds/docs/assets/colors.svg b/apps/admin-x-design-system/src/docs/assets/colors.svg
similarity index 100%
rename from apps/admin-x-settings/src/admin-x-ds/docs/assets/colors.svg
rename to apps/admin-x-design-system/src/docs/assets/colors.svg
diff --git a/apps/admin-x-settings/src/admin-x-ds/docs/assets/comments.svg b/apps/admin-x-design-system/src/docs/assets/comments.svg
similarity index 100%
rename from apps/admin-x-settings/src/admin-x-ds/docs/assets/comments.svg
rename to apps/admin-x-design-system/src/docs/assets/comments.svg
diff --git a/apps/admin-x-settings/src/admin-x-ds/docs/assets/direction.svg b/apps/admin-x-design-system/src/docs/assets/direction.svg
similarity index 100%
rename from apps/admin-x-settings/src/admin-x-ds/docs/assets/direction.svg
rename to apps/admin-x-design-system/src/docs/assets/direction.svg
diff --git a/apps/admin-x-settings/src/admin-x-ds/docs/assets/ds-structure.png b/apps/admin-x-design-system/src/docs/assets/ds-structure.png
similarity index 100%
rename from apps/admin-x-settings/src/admin-x-ds/docs/assets/ds-structure.png
rename to apps/admin-x-design-system/src/docs/assets/ds-structure.png
diff --git a/apps/admin-x-settings/src/admin-x-ds/docs/assets/flow.svg b/apps/admin-x-design-system/src/docs/assets/flow.svg
similarity index 100%
rename from apps/admin-x-settings/src/admin-x-ds/docs/assets/flow.svg
rename to apps/admin-x-design-system/src/docs/assets/flow.svg
diff --git a/apps/admin-x-settings/src/admin-x-ds/docs/assets/global-error-example.png b/apps/admin-x-design-system/src/docs/assets/global-error-example.png
similarity index 100%
rename from apps/admin-x-settings/src/admin-x-ds/docs/assets/global-error-example.png
rename to apps/admin-x-design-system/src/docs/assets/global-error-example.png
diff --git a/apps/admin-x-settings/src/admin-x-ds/docs/assets/local-error-example.png b/apps/admin-x-design-system/src/docs/assets/local-error-example.png
similarity index 100%
rename from apps/admin-x-settings/src/admin-x-ds/docs/assets/local-error-example.png
rename to apps/admin-x-design-system/src/docs/assets/local-error-example.png
diff --git a/apps/admin-x-settings/src/admin-x-ds/docs/assets/page-error-example.png b/apps/admin-x-design-system/src/docs/assets/page-error-example.png
similarity index 100%
rename from apps/admin-x-settings/src/admin-x-ds/docs/assets/page-error-example.png
rename to apps/admin-x-design-system/src/docs/assets/page-error-example.png
diff --git a/apps/admin-x-settings/src/admin-x-ds/docs/assets/plugin.svg b/apps/admin-x-design-system/src/docs/assets/plugin.svg
similarity index 100%
rename from apps/admin-x-settings/src/admin-x-ds/docs/assets/plugin.svg
rename to apps/admin-x-design-system/src/docs/assets/plugin.svg
diff --git a/apps/admin-x-settings/src/admin-x-ds/docs/assets/repo.svg b/apps/admin-x-design-system/src/docs/assets/repo.svg
similarity index 100%
rename from apps/admin-x-settings/src/admin-x-ds/docs/assets/repo.svg
rename to apps/admin-x-design-system/src/docs/assets/repo.svg
diff --git a/apps/admin-x-settings/src/admin-x-ds/docs/assets/stackalt.svg b/apps/admin-x-design-system/src/docs/assets/stackalt.svg
similarity index 100%
rename from apps/admin-x-settings/src/admin-x-ds/docs/assets/stackalt.svg
rename to apps/admin-x-design-system/src/docs/assets/stackalt.svg
diff --git a/apps/admin-x-settings/src/admin-x-ds/docs/assets/streamline-settings.png b/apps/admin-x-design-system/src/docs/assets/streamline-settings.png
similarity index 100%
rename from apps/admin-x-settings/src/admin-x-ds/docs/assets/streamline-settings.png
rename to apps/admin-x-design-system/src/docs/assets/streamline-settings.png
diff --git a/apps/admin-x-settings/src/admin-x-ds/docs/assets/style-guide-layout.png b/apps/admin-x-design-system/src/docs/assets/style-guide-layout.png
similarity index 100%
rename from apps/admin-x-settings/src/admin-x-ds/docs/assets/style-guide-layout.png
rename to apps/admin-x-design-system/src/docs/assets/style-guide-layout.png
diff --git a/apps/admin-x-settings/src/admin-x-ds/docs/assets/style-guide.png b/apps/admin-x-design-system/src/docs/assets/style-guide.png
similarity index 100%
rename from apps/admin-x-settings/src/admin-x-ds/docs/assets/style-guide.png
rename to apps/admin-x-design-system/src/docs/assets/style-guide.png
diff --git a/apps/admin-x-settings/src/admin-x-ds/docs/assets/tower.svg b/apps/admin-x-design-system/src/docs/assets/tower.svg
similarity index 100%
rename from apps/admin-x-settings/src/admin-x-ds/docs/assets/tower.svg
rename to apps/admin-x-design-system/src/docs/assets/tower.svg
diff --git a/apps/admin-x-settings/src/admin-x-ds/global/Avatar.stories.tsx b/apps/admin-x-design-system/src/global/Avatar.stories.tsx
similarity index 100%
rename from apps/admin-x-settings/src/admin-x-ds/global/Avatar.stories.tsx
rename to apps/admin-x-design-system/src/global/Avatar.stories.tsx
diff --git a/apps/admin-x-settings/src/admin-x-ds/global/Avatar.tsx b/apps/admin-x-design-system/src/global/Avatar.tsx
similarity index 97%
rename from apps/admin-x-settings/src/admin-x-ds/global/Avatar.tsx
rename to apps/admin-x-design-system/src/global/Avatar.tsx
index 6d0a30befa9..f95801b0fa5 100644
--- a/apps/admin-x-settings/src/admin-x-ds/global/Avatar.tsx
+++ b/apps/admin-x-design-system/src/global/Avatar.tsx
@@ -3,7 +3,7 @@ import {ReactComponent as UserIcon} from '../assets/icons/single-user-fill.svg';
 
 type AvatarSize = 'sm' | 'md' | 'lg' | 'xl';
 
-interface AvatarProps {
+export interface AvatarProps {
     image?: string;
     label?: string;
 
@@ -57,4 +57,4 @@ const Avatar: React.FC<AvatarProps> = ({image, label, labelColor, bgColor, size,
     }
 };
 
-export default Avatar;
\ No newline at end of file
+export default Avatar;
diff --git a/apps/admin-x-settings/src/admin-x-ds/global/Banner.stories.tsx b/apps/admin-x-design-system/src/global/Banner.stories.tsx
similarity index 100%
rename from apps/admin-x-settings/src/admin-x-ds/global/Banner.stories.tsx
rename to apps/admin-x-design-system/src/global/Banner.stories.tsx
diff --git a/apps/admin-x-settings/src/admin-x-ds/global/Banner.tsx b/apps/admin-x-design-system/src/global/Banner.tsx
similarity index 95%
rename from apps/admin-x-settings/src/admin-x-ds/global/Banner.tsx
rename to apps/admin-x-design-system/src/global/Banner.tsx
index ad74060d140..40b9608367b 100644
--- a/apps/admin-x-settings/src/admin-x-ds/global/Banner.tsx
+++ b/apps/admin-x-design-system/src/global/Banner.tsx
@@ -1,7 +1,7 @@
-import React from 'react';
 import clsx from 'clsx';
+import React from 'react';
 
-interface BannerProps {
+export interface BannerProps {
     color?: 'grey' | 'blue' | 'green' | 'yellow' | 'red';
     children?: React.ReactNode;
     className?: string;
@@ -33,4 +33,4 @@ const Banner: React.FC<BannerProps> = ({color = 'grey', children, className}) =>
     );
 };
 
-export default Banner;
\ No newline at end of file
+export default Banner;
diff --git a/apps/admin-x-settings/src/admin-x-ds/global/Breadcrumbs.stories.tsx b/apps/admin-x-design-system/src/global/Breadcrumbs.stories.tsx
similarity index 100%
rename from apps/admin-x-settings/src/admin-x-ds/global/Breadcrumbs.stories.tsx
rename to apps/admin-x-design-system/src/global/Breadcrumbs.stories.tsx
diff --git a/apps/admin-x-settings/src/admin-x-ds/global/Breadcrumbs.tsx b/apps/admin-x-design-system/src/global/Breadcrumbs.tsx
similarity index 96%
rename from apps/admin-x-settings/src/admin-x-ds/global/Breadcrumbs.tsx
rename to apps/admin-x-design-system/src/global/Breadcrumbs.tsx
index 63b9443181c..aa93dfafaeb 100644
--- a/apps/admin-x-settings/src/admin-x-ds/global/Breadcrumbs.tsx
+++ b/apps/admin-x-design-system/src/global/Breadcrumbs.tsx
@@ -1,13 +1,13 @@
-import Button from './Button';
-import React from 'react';
 import clsx from 'clsx';
+import React from 'react';
+import Button from './Button';
 
 export type BreadcrumbItem = {
     label: React.ReactNode;
     onClick?: () => void;
 }
 
-interface BreadcrumbsProps {
+export interface BreadcrumbsProps {
     items: BreadcrumbItem[];
     backIcon?: boolean;
     onBack?: () => void;
@@ -71,4 +71,4 @@ const Breadcrumbs: React.FC<BreadcrumbsProps> = ({
     );
 };
 
-export default Breadcrumbs;
\ No newline at end of file
+export default Breadcrumbs;
diff --git a/apps/admin-x-settings/src/admin-x-ds/global/Button.stories.tsx b/apps/admin-x-design-system/src/global/Button.stories.tsx
similarity index 100%
rename from apps/admin-x-settings/src/admin-x-ds/global/Button.stories.tsx
rename to apps/admin-x-design-system/src/global/Button.stories.tsx
diff --git a/apps/admin-x-settings/src/admin-x-ds/global/Button.tsx b/apps/admin-x-design-system/src/global/Button.tsx
similarity index 100%
rename from apps/admin-x-settings/src/admin-x-ds/global/Button.tsx
rename to apps/admin-x-design-system/src/global/Button.tsx
diff --git a/apps/admin-x-settings/src/admin-x-ds/global/ButtonGroup.stories.tsx b/apps/admin-x-design-system/src/global/ButtonGroup.stories.tsx
similarity index 100%
rename from apps/admin-x-settings/src/admin-x-ds/global/ButtonGroup.stories.tsx
rename to apps/admin-x-design-system/src/global/ButtonGroup.stories.tsx
diff --git a/apps/admin-x-settings/src/admin-x-ds/global/ButtonGroup.tsx b/apps/admin-x-design-system/src/global/ButtonGroup.tsx
similarity index 90%
rename from apps/admin-x-settings/src/admin-x-ds/global/ButtonGroup.tsx
rename to apps/admin-x-design-system/src/global/ButtonGroup.tsx
index 1c8e54cd5d8..bd86202daf3 100644
--- a/apps/admin-x-settings/src/admin-x-ds/global/ButtonGroup.tsx
+++ b/apps/admin-x-design-system/src/global/ButtonGroup.tsx
@@ -1,9 +1,9 @@
-import Button from './Button';
 import React from 'react';
+import Button from './Button';
 
 import {ButtonProps} from './Button';
 
-interface ButtonGroupProps {
+export interface ButtonGroupProps {
     buttons: Array<ButtonProps>;
     link?: boolean;
     linkWithPadding?: boolean;
@@ -20,4 +20,4 @@ const ButtonGroup: React.FC<ButtonGroupProps> = ({buttons, link, linkWithPadding
     );
 };
 
-export default ButtonGroup;
\ No newline at end of file
+export default ButtonGroup;
diff --git a/apps/admin-x-settings/src/admin-x-ds/global/ErrorBoundary.stories.tsx b/apps/admin-x-design-system/src/global/ErrorBoundary.stories.tsx
similarity index 100%
rename from apps/admin-x-settings/src/admin-x-ds/global/ErrorBoundary.stories.tsx
rename to apps/admin-x-design-system/src/global/ErrorBoundary.stories.tsx
diff --git a/apps/admin-x-settings/src/admin-x-ds/global/ErrorBoundary.tsx b/apps/admin-x-design-system/src/global/ErrorBoundary.tsx
similarity index 86%
rename from apps/admin-x-settings/src/admin-x-ds/global/ErrorBoundary.tsx
rename to apps/admin-x-design-system/src/global/ErrorBoundary.tsx
index 4fe0db91ad1..f328a7f0c26 100644
--- a/apps/admin-x-settings/src/admin-x-ds/global/ErrorBoundary.tsx
+++ b/apps/admin-x-design-system/src/global/ErrorBoundary.tsx
@@ -1,12 +1,17 @@
 import * as Sentry from '@sentry/react';
-import Banner from './Banner';
 import React, {ComponentType, ErrorInfo, ReactNode} from 'react';
+import Banner from './Banner';
+
+export interface ErrorBoundaryProps {
+    children: ReactNode;
+    name: ReactNode;
+}
 
 /**
  * Catches errors in child components and displays a banner. Useful to prevent errors in one
  * section from crashing the entire page
  */
-class ErrorBoundary extends React.Component<{children: ReactNode, name: ReactNode}> {
+class ErrorBoundary extends React.Component<ErrorBoundaryProps> {
     state = {hasError: false};
 
     constructor(props: {children: ReactNode, name: ReactNode}) {
@@ -19,7 +24,7 @@ class ErrorBoundary extends React.Component<{children: ReactNode, name: ReactNod
 
     componentDidCatch(error: unknown, info: ErrorInfo) {
         Sentry.withScope((scope) => {
-            scope.setTag('adminX settings component-', info.componentStack);
+            scope.setTag('adminx_settings_component', info.componentStack);
             Sentry.captureException(error);
         });
         // eslint-disable-next-line no-console
diff --git a/apps/admin-x-settings/src/admin-x-ds/global/Heading.stories.tsx b/apps/admin-x-design-system/src/global/Heading.stories.tsx
similarity index 100%
rename from apps/admin-x-settings/src/admin-x-ds/global/Heading.stories.tsx
rename to apps/admin-x-design-system/src/global/Heading.stories.tsx
diff --git a/apps/admin-x-settings/src/admin-x-ds/global/Heading.tsx b/apps/admin-x-design-system/src/global/Heading.tsx
similarity index 91%
rename from apps/admin-x-settings/src/admin-x-ds/global/Heading.tsx
rename to apps/admin-x-design-system/src/global/Heading.tsx
index ff378d37423..427213cea06 100644
--- a/apps/admin-x-settings/src/admin-x-ds/global/Heading.tsx
+++ b/apps/admin-x-design-system/src/global/Heading.tsx
@@ -1,6 +1,6 @@
+import clsx from 'clsx';
 import React from 'react';
 import Separator from './Separator';
-import clsx from 'clsx';
 
 export type HeadingLevel = 1 | 2 | 3 | 4 | 5 | 6;
 
@@ -44,7 +44,9 @@ export const Heading6StylesGrey = clsx(
     'text-grey-900 dark:text-grey-500'
 );
 
-const Heading: React.FC<Heading1to5Props | Heading6Props | HeadingLabelProps> = ({
+export type HeadingProps = Heading1to5Props | Heading6Props | HeadingLabelProps
+
+const Heading: React.FC<HeadingProps> = ({
     level = 1,
     children,
     styles = '',
@@ -88,8 +90,8 @@ const Heading: React.FC<Heading1to5Props | Heading6Props | HeadingLabelProps> =
     const Element = React.createElement(newElement, {className: className, key: 'heading-elem', ...props}, children);
 
     if (separator) {
-        let gap = (!level || level === 1) ? 2 : 1;
-        let bottomMargin = (level === 6) ? 2 : 3;
+        const gap = (!level || level === 1) ? 2 : 1;
+        const bottomMargin = (level === 6) ? 2 : 3;
         return (
             <div className={`gap-${gap} mb-${bottomMargin} flex flex-col`}>
                 {Element}
diff --git a/apps/admin-x-settings/src/admin-x-ds/global/Hint.stories.tsx b/apps/admin-x-design-system/src/global/Hint.stories.tsx
similarity index 100%
rename from apps/admin-x-settings/src/admin-x-ds/global/Hint.stories.tsx
rename to apps/admin-x-design-system/src/global/Hint.stories.tsx
diff --git a/apps/admin-x-settings/src/admin-x-ds/global/Hint.tsx b/apps/admin-x-design-system/src/global/Hint.tsx
similarity index 96%
rename from apps/admin-x-settings/src/admin-x-ds/global/Hint.tsx
rename to apps/admin-x-design-system/src/global/Hint.tsx
index a8c170b9210..77dc0fbb893 100644
--- a/apps/admin-x-settings/src/admin-x-ds/global/Hint.tsx
+++ b/apps/admin-x-design-system/src/global/Hint.tsx
@@ -1,7 +1,7 @@
-import React from 'react';
 import clsx from 'clsx';
+import React from 'react';
 
-interface HintProps {
+export interface HintProps {
     children?: React.ReactNode;
     color?: 'red' | 'green' | 'default' | '';
     className?: string;
diff --git a/apps/admin-x-settings/src/admin-x-ds/global/Icon.stories.tsx b/apps/admin-x-design-system/src/global/Icon.stories.tsx
similarity index 100%
rename from apps/admin-x-settings/src/admin-x-ds/global/Icon.stories.tsx
rename to apps/admin-x-design-system/src/global/Icon.stories.tsx
diff --git a/apps/admin-x-settings/src/admin-x-ds/global/Icon.tsx b/apps/admin-x-design-system/src/global/Icon.tsx
similarity index 91%
rename from apps/admin-x-settings/src/admin-x-ds/global/Icon.tsx
rename to apps/admin-x-design-system/src/global/Icon.tsx
index 4a082527f9c..bb3e71df4b0 100644
--- a/apps/admin-x-settings/src/admin-x-ds/global/Icon.tsx
+++ b/apps/admin-x-design-system/src/global/Icon.tsx
@@ -1,11 +1,11 @@
-import React from 'react';
 import clsx from 'clsx';
+import React from 'react';
 
 const icons: Record<string, {ReactComponent: React.FC<React.SVGProps<SVGSVGElement>>}> = import.meta.glob('../assets/icons/*.svg', {eager: true});
 
-export type IconSize = 'xs' | 'sm' | 'md' | 'lg' | 'xl' | number;
+export type IconSize = 'xs' | 'sm' | 'md' | 'lg' | 'xl' | 'custom' | number;
 
-interface IconProps {
+export interface IconProps {
     name: string;
 
     /**
@@ -34,6 +34,8 @@ const Icon: React.FC<IconProps> = ({name, size = 'md', colorClass = '', classNam
 
     if (!styles) {
         switch (size) {
+        case 'custom':
+            break;
         case 'xs':
             styles = 'w-3 h-3';
             break;
diff --git a/apps/admin-x-settings/src/admin-x-ds/global/IconLabel.stories.tsx b/apps/admin-x-design-system/src/global/IconLabel.stories.tsx
similarity index 100%
rename from apps/admin-x-settings/src/admin-x-ds/global/IconLabel.stories.tsx
rename to apps/admin-x-design-system/src/global/IconLabel.stories.tsx
diff --git a/apps/admin-x-settings/src/admin-x-ds/global/IconLabel.tsx b/apps/admin-x-design-system/src/global/IconLabel.tsx
similarity index 87%
rename from apps/admin-x-settings/src/admin-x-ds/global/IconLabel.tsx
rename to apps/admin-x-design-system/src/global/IconLabel.tsx
index d9ec84bfd79..ca66ff46c88 100644
--- a/apps/admin-x-settings/src/admin-x-ds/global/IconLabel.tsx
+++ b/apps/admin-x-design-system/src/global/IconLabel.tsx
@@ -1,7 +1,7 @@
-import Icon from './Icon';
 import React from 'react';
+import Icon from './Icon';
 
-interface IconLabelProps {
+export interface IconLabelProps {
     icon: string;
     iconColorClass?: string;
     children?: React.ReactNode;
@@ -16,4 +16,4 @@ const IconLabel: React.FC<IconLabelProps> = ({icon, iconColorClass, children}) =
     );
 };
 
-export default IconLabel;
\ No newline at end of file
+export default IconLabel;
diff --git a/apps/admin-x-settings/src/admin-x-ds/global/InfiniteScrollListener.stories.tsx b/apps/admin-x-design-system/src/global/InfiniteScrollListener.stories.tsx
similarity index 100%
rename from apps/admin-x-settings/src/admin-x-ds/global/InfiniteScrollListener.stories.tsx
rename to apps/admin-x-design-system/src/global/InfiniteScrollListener.stories.tsx
diff --git a/apps/admin-x-settings/src/admin-x-ds/global/InfiniteScrollListener.tsx b/apps/admin-x-design-system/src/global/InfiniteScrollListener.tsx
similarity index 82%
rename from apps/admin-x-settings/src/admin-x-ds/global/InfiniteScrollListener.tsx
rename to apps/admin-x-design-system/src/global/InfiniteScrollListener.tsx
index 632bc75ac9d..08dd4d8d60c 100644
--- a/apps/admin-x-settings/src/admin-x-ds/global/InfiniteScrollListener.tsx
+++ b/apps/admin-x-design-system/src/global/InfiniteScrollListener.tsx
@@ -1,15 +1,17 @@
 import React, {useEffect, useRef} from 'react';
 
+export interface InfiniteScrollListenerProps {
+    /** How many pixels before the end of the container the callback should trigger */
+    offset: number;
+    onTrigger: () => void;
+}
+
 /**
  * Triggers a callback when the user scrolls close to the end of an element
  * (exactly how close is configurable with `offset`). The parent element must have
  * position: relative/absolute/etc.
  */
-const InfiniteScrollListener: React.FC<{
-    /** How many pixels before the end of the container the callback should trigger */
-    offset: number
-    onTrigger: () => void
-}> = ({offset, onTrigger}) => {
+const InfiniteScrollListener: React.FC<InfiniteScrollListenerProps> = ({offset, onTrigger}) => {
     const ref = useRef<HTMLDivElement>(null);
 
     useEffect(() => {
diff --git a/apps/admin-x-settings/src/admin-x-ds/global/Link.stories.tsx b/apps/admin-x-design-system/src/global/Link.stories.tsx
similarity index 100%
rename from apps/admin-x-settings/src/admin-x-ds/global/Link.stories.tsx
rename to apps/admin-x-design-system/src/global/Link.stories.tsx
diff --git a/apps/admin-x-settings/src/admin-x-ds/global/Link.tsx b/apps/admin-x-design-system/src/global/Link.tsx
similarity index 89%
rename from apps/admin-x-settings/src/admin-x-ds/global/Link.tsx
rename to apps/admin-x-design-system/src/global/Link.tsx
index dc389789e5c..476fa0244ab 100644
--- a/apps/admin-x-settings/src/admin-x-ds/global/Link.tsx
+++ b/apps/admin-x-design-system/src/global/Link.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 
-interface LinkProps extends React.ComponentPropsWithoutRef<'a'> {
+export interface LinkProps extends React.ComponentPropsWithoutRef<'a'> {
     href: string;
 
     /**
diff --git a/apps/admin-x-settings/src/admin-x-ds/global/List.stories.tsx b/apps/admin-x-design-system/src/global/List.stories.tsx
similarity index 100%
rename from apps/admin-x-settings/src/admin-x-ds/global/List.stories.tsx
rename to apps/admin-x-design-system/src/global/List.stories.tsx
diff --git a/apps/admin-x-settings/src/admin-x-ds/global/List.tsx b/apps/admin-x-design-system/src/global/List.tsx
similarity index 97%
rename from apps/admin-x-settings/src/admin-x-ds/global/List.tsx
rename to apps/admin-x-design-system/src/global/List.tsx
index a2e43abcd50..bbbb41dffab 100644
--- a/apps/admin-x-settings/src/admin-x-ds/global/List.tsx
+++ b/apps/admin-x-design-system/src/global/List.tsx
@@ -1,11 +1,11 @@
+import clsx from 'clsx';
+import React from 'react';
 import Heading from './Heading';
 import Hint from './Hint';
 import ListHeading, {ListHeadingSize} from './ListHeading';
-import React from 'react';
 import Separator from './Separator';
-import clsx from 'clsx';
 
-interface ListProps {
+export interface ListProps {
     /**
      * If the list is the primary content on a page (e.g. Members list) then you can set a pagetitle to be consistent
      */
@@ -62,4 +62,4 @@ const List: React.FC<ListProps> = ({
     );
 };
 
-export default List;
\ No newline at end of file
+export default List;
diff --git a/apps/admin-x-settings/src/admin-x-ds/global/ListHeading.tsx b/apps/admin-x-design-system/src/global/ListHeading.tsx
similarity index 94%
rename from apps/admin-x-settings/src/admin-x-ds/global/ListHeading.tsx
rename to apps/admin-x-design-system/src/global/ListHeading.tsx
index bf82d757dbd..50e60095908 100644
--- a/apps/admin-x-settings/src/admin-x-ds/global/ListHeading.tsx
+++ b/apps/admin-x-design-system/src/global/ListHeading.tsx
@@ -1,10 +1,10 @@
-import Heading from './Heading';
 import React from 'react';
+import Heading from './Heading';
 import Separator from './Separator';
 
 export type ListHeadingSize = 'sm' | 'lg';
 
-interface ListHeadingProps {
+export interface ListHeadingProps {
     title?: React.ReactNode;
     titleSize?: ListHeadingSize,
     actions?: React.ReactNode;
@@ -44,4 +44,4 @@ const ListHeading: React.FC<ListHeadingProps> = ({
     return <></>;
 };
 
-export default ListHeading;
\ No newline at end of file
+export default ListHeading;
diff --git a/apps/admin-x-settings/src/admin-x-ds/global/ListItem.stories.tsx b/apps/admin-x-design-system/src/global/ListItem.stories.tsx
similarity index 100%
rename from apps/admin-x-settings/src/admin-x-ds/global/ListItem.stories.tsx
rename to apps/admin-x-design-system/src/global/ListItem.stories.tsx
diff --git a/apps/admin-x-settings/src/admin-x-ds/global/ListItem.tsx b/apps/admin-x-design-system/src/global/ListItem.tsx
similarity index 98%
rename from apps/admin-x-settings/src/admin-x-ds/global/ListItem.tsx
rename to apps/admin-x-design-system/src/global/ListItem.tsx
index 8c1b0fffdae..ca2b616ad6f 100644
--- a/apps/admin-x-settings/src/admin-x-ds/global/ListItem.tsx
+++ b/apps/admin-x-design-system/src/global/ListItem.tsx
@@ -1,7 +1,7 @@
-import React from 'react';
 import clsx from 'clsx';
+import React from 'react';
 
-interface ListItemProps {
+export interface ListItemProps {
     id?: string;
     title?: React.ReactNode;
     detail?: React.ReactNode;
diff --git a/apps/admin-x-settings/src/admin-x-ds/global/LoadingIndicator.stories.tsx b/apps/admin-x-design-system/src/global/LoadingIndicator.stories.tsx
similarity index 100%
rename from apps/admin-x-settings/src/admin-x-ds/global/LoadingIndicator.stories.tsx
rename to apps/admin-x-design-system/src/global/LoadingIndicator.stories.tsx
diff --git a/apps/admin-x-settings/src/admin-x-ds/global/LoadingIndicator.tsx b/apps/admin-x-design-system/src/global/LoadingIndicator.tsx
similarity index 97%
rename from apps/admin-x-settings/src/admin-x-ds/global/LoadingIndicator.tsx
rename to apps/admin-x-design-system/src/global/LoadingIndicator.tsx
index 1b77113acc5..4f5f40fb752 100644
--- a/apps/admin-x-settings/src/admin-x-ds/global/LoadingIndicator.tsx
+++ b/apps/admin-x-design-system/src/global/LoadingIndicator.tsx
@@ -3,7 +3,7 @@ import React from 'react';
 export type LoadingIndicatorSize = 'sm' | 'md' | 'lg';
 export type LoadingIndicatorColor = 'light' | 'dark';
 
-type LoadingIndicatorProps = {
+export interface LoadingIndicatorProps {
     size?: LoadingIndicatorSize;
     color?: LoadingIndicatorColor;
     delay?: number;
@@ -60,4 +60,4 @@ export const LoadingIndicator: React.FC<LoadingIndicatorProps> = ({size, color,
             <div className={styles}></div>
         );
     }
-};
\ No newline at end of file
+};
diff --git a/apps/admin-x-settings/src/admin-x-ds/global/Menu.stories.tsx b/apps/admin-x-design-system/src/global/Menu.stories.tsx
similarity index 100%
rename from apps/admin-x-settings/src/admin-x-ds/global/Menu.stories.tsx
rename to apps/admin-x-design-system/src/global/Menu.stories.tsx
diff --git a/apps/admin-x-settings/src/admin-x-ds/global/Menu.tsx b/apps/admin-x-design-system/src/global/Menu.tsx
similarity index 97%
rename from apps/admin-x-settings/src/admin-x-ds/global/Menu.tsx
rename to apps/admin-x-design-system/src/global/Menu.tsx
index 042f51d479a..480604eacc8 100644
--- a/apps/admin-x-settings/src/admin-x-ds/global/Menu.tsx
+++ b/apps/admin-x-design-system/src/global/Menu.tsx
@@ -1,6 +1,6 @@
+import React from 'react';
 import Button, {ButtonProps, ButtonSize} from './Button';
 import Popover, {PopoverPosition} from './Popover';
-import React from 'react';
 
 export type MenuItem = {
     id: string,
@@ -8,7 +8,7 @@ export type MenuItem = {
     onClick?: () => void
 }
 
-interface MenuProps {
+export interface MenuProps {
     trigger?: React.ReactNode;
     triggerButtonProps?: ButtonProps;
     triggerSize?: ButtonSize;
diff --git a/apps/admin-x-settings/src/admin-x-ds/global/NoValueLabel.stories.tsx b/apps/admin-x-design-system/src/global/NoValueLabel.stories.tsx
similarity index 100%
rename from apps/admin-x-settings/src/admin-x-ds/global/NoValueLabel.stories.tsx
rename to apps/admin-x-design-system/src/global/NoValueLabel.stories.tsx
diff --git a/apps/admin-x-settings/src/admin-x-ds/global/NoValueLabel.tsx b/apps/admin-x-design-system/src/global/NoValueLabel.tsx
similarity index 88%
rename from apps/admin-x-settings/src/admin-x-ds/global/NoValueLabel.tsx
rename to apps/admin-x-design-system/src/global/NoValueLabel.tsx
index 7b02360fe0b..1a980acc14a 100644
--- a/apps/admin-x-settings/src/admin-x-ds/global/NoValueLabel.tsx
+++ b/apps/admin-x-design-system/src/global/NoValueLabel.tsx
@@ -1,7 +1,7 @@
-import Icon from './Icon';
 import React from 'react';
+import Icon from './Icon';
 
-interface NoValueLabelProps {
+export interface NoValueLabelProps {
     icon?: string;
     children: React.ReactNode;
 }
@@ -18,4 +18,4 @@ const NoValueLabel: React.FC<NoValueLabelProps> = ({icon, children}) => {
     );
 };
 
-export default NoValueLabel;
\ No newline at end of file
+export default NoValueLabel;
diff --git a/apps/admin-x-settings/src/admin-x-ds/global/Pagination.stories.tsx b/apps/admin-x-design-system/src/global/Pagination.stories.tsx
similarity index 100%
rename from apps/admin-x-settings/src/admin-x-ds/global/Pagination.stories.tsx
rename to apps/admin-x-design-system/src/global/Pagination.stories.tsx
diff --git a/apps/admin-x-settings/src/admin-x-ds/global/Pagination.tsx b/apps/admin-x-design-system/src/global/Pagination.tsx
similarity index 94%
rename from apps/admin-x-settings/src/admin-x-ds/global/Pagination.tsx
rename to apps/admin-x-design-system/src/global/Pagination.tsx
index 6f2f6283f53..d994234d88f 100644
--- a/apps/admin-x-settings/src/admin-x-ds/global/Pagination.tsx
+++ b/apps/admin-x-design-system/src/global/Pagination.tsx
@@ -1,8 +1,8 @@
-import Icon from './Icon';
 import React from 'react';
-import {PaginationData} from '../../hooks/usePagination';
+import {PaginationData} from '../hooks/usePagination';
+import Icon from './Icon';
 
-type PaginationProps = PaginationData
+export type PaginationProps = PaginationData
 
 const Pagination: React.FC<PaginationProps> = ({page, limit, total, prevPage, nextPage}) => {
     // Detect loading state
diff --git a/apps/admin-x-settings/src/admin-x-ds/global/Popover.stories.tsx b/apps/admin-x-design-system/src/global/Popover.stories.tsx
similarity index 100%
rename from apps/admin-x-settings/src/admin-x-ds/global/Popover.stories.tsx
rename to apps/admin-x-design-system/src/global/Popover.stories.tsx
diff --git a/apps/admin-x-settings/src/admin-x-ds/global/Popover.tsx b/apps/admin-x-design-system/src/global/Popover.tsx
similarity index 85%
rename from apps/admin-x-settings/src/admin-x-ds/global/Popover.tsx
rename to apps/admin-x-design-system/src/global/Popover.tsx
index f84cb6dca13..01b25a2d3cd 100644
--- a/apps/admin-x-settings/src/admin-x-ds/global/Popover.tsx
+++ b/apps/admin-x-design-system/src/global/Popover.tsx
@@ -1,10 +1,10 @@
-import React, {useRef, useState} from 'react';
 import clsx from 'clsx';
+import React, {useRef, useState} from 'react';
 import {createPortal} from 'react-dom';
 
 export type PopoverPosition = 'left' | 'right';
 
-interface PopoverProps {
+export interface PopoverProps {
     trigger: React.ReactNode;
     children: React.ReactNode;
     position?: PopoverPosition;
@@ -32,14 +32,14 @@ const Popover: React.FC<PopoverProps> = ({
     const handleTriggerClick = () => {
         if (!open && triggerRef.current) {
             const parentRect = getOffsetPosition(triggerRef.current);
-            let {x, y, width, height} = triggerRef.current.getBoundingClientRect();
-            x -= parentRect.x;
-            y -= parentRect.y;
+            const {x, y, width, height} = triggerRef.current.getBoundingClientRect();
+            const relativeX = x - parentRect.x;
+            const relativeY = y - parentRect.y;
 
-            const finalX = (position === 'left') ? x : window.innerWidth - (x + width);
+            const finalX = (position === 'left') ? relativeX : window.innerWidth - (relativeX + width);
             setOpen(true);
             setPositionX(finalX);
-            setPositionY(y + height);
+            setPositionY(relativeY + height);
         } else {
             setOpen(false);
         }
@@ -89,7 +89,7 @@ const Popover: React.FC<PopoverProps> = ({
                 <div className={className} data-testid='popover-content' style={style}>
                     {children}
                 </div>
-            </div>, triggerRef.current?.closest('.admin-x-settings') || document.body)}
+            </div>, triggerRef.current?.closest('.admin-x-base') || document.body)}
         </>
     );
 };
diff --git a/apps/admin-x-settings/src/admin-x-ds/global/Separator.stories.tsx b/apps/admin-x-design-system/src/global/Separator.stories.tsx
similarity index 100%
rename from apps/admin-x-settings/src/admin-x-ds/global/Separator.stories.tsx
rename to apps/admin-x-design-system/src/global/Separator.stories.tsx
diff --git a/apps/admin-x-settings/src/admin-x-ds/global/Separator.tsx b/apps/admin-x-design-system/src/global/Separator.tsx
similarity index 80%
rename from apps/admin-x-settings/src/admin-x-ds/global/Separator.tsx
rename to apps/admin-x-design-system/src/global/Separator.tsx
index 5df81e57e1e..2f1b9c18473 100644
--- a/apps/admin-x-settings/src/admin-x-ds/global/Separator.tsx
+++ b/apps/admin-x-design-system/src/global/Separator.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 
-interface SeparatorProps {
+export interface SeparatorProps {
     className?: string;
 }
 
@@ -11,4 +11,4 @@ const Separator: React.FC<SeparatorProps> = ({className}) => {
     return <hr className={className} />;
 };
 
-export default Separator;
\ No newline at end of file
+export default Separator;
diff --git a/apps/admin-x-settings/src/admin-x-ds/global/SortableList.stories.tsx b/apps/admin-x-design-system/src/global/SortableList.stories.tsx
similarity index 100%
rename from apps/admin-x-settings/src/admin-x-ds/global/SortableList.stories.tsx
rename to apps/admin-x-design-system/src/global/SortableList.stories.tsx
diff --git a/apps/admin-x-settings/src/admin-x-ds/global/SortableList.tsx b/apps/admin-x-design-system/src/global/SortableList.tsx
similarity index 100%
rename from apps/admin-x-settings/src/admin-x-ds/global/SortableList.tsx
rename to apps/admin-x-design-system/src/global/SortableList.tsx
diff --git a/apps/admin-x-settings/src/admin-x-ds/global/StickyFooter.stories.tsx b/apps/admin-x-design-system/src/global/StickyFooter.stories.tsx
similarity index 100%
rename from apps/admin-x-settings/src/admin-x-ds/global/StickyFooter.stories.tsx
rename to apps/admin-x-design-system/src/global/StickyFooter.stories.tsx
diff --git a/apps/admin-x-settings/src/admin-x-ds/global/StickyFooter.tsx b/apps/admin-x-design-system/src/global/StickyFooter.tsx
similarity index 96%
rename from apps/admin-x-settings/src/admin-x-ds/global/StickyFooter.tsx
rename to apps/admin-x-design-system/src/global/StickyFooter.tsx
index ff951baf1ed..9271689d401 100644
--- a/apps/admin-x-settings/src/admin-x-ds/global/StickyFooter.tsx
+++ b/apps/admin-x-design-system/src/global/StickyFooter.tsx
@@ -1,7 +1,7 @@
-import React from 'react';
 import clsx from 'clsx';
+import React from 'react';
 
-interface StickyFooterProps {
+export interface StickyFooterProps {
     shiftY?: string;
     footerBgColorClass?: string;
     contentBgColorClass?: string;
@@ -68,4 +68,4 @@ const StickyFooter: React.FC<StickyFooterProps> = ({
     );
 };
 
-export default StickyFooter;
\ No newline at end of file
+export default StickyFooter;
diff --git a/apps/admin-x-settings/src/admin-x-ds/global/TabView.stories.tsx b/apps/admin-x-design-system/src/global/TabView.stories.tsx
similarity index 100%
rename from apps/admin-x-settings/src/admin-x-ds/global/TabView.stories.tsx
rename to apps/admin-x-design-system/src/global/TabView.stories.tsx
diff --git a/apps/admin-x-settings/src/admin-x-ds/global/TabView.tsx b/apps/admin-x-design-system/src/global/TabView.tsx
similarity index 98%
rename from apps/admin-x-settings/src/admin-x-ds/global/TabView.tsx
rename to apps/admin-x-design-system/src/global/TabView.tsx
index aa959ce572c..ca8fd8361e5 100644
--- a/apps/admin-x-settings/src/admin-x-ds/global/TabView.tsx
+++ b/apps/admin-x-design-system/src/global/TabView.tsx
@@ -1,5 +1,5 @@
-import React from 'react';
 import clsx from 'clsx';
+import React from 'react';
 
 export type Tab<ID = string> = {
     id: ID;
@@ -12,7 +12,7 @@ export type Tab<ID = string> = {
     contents?: React.ReactNode;
 }
 
-interface TabViewProps<ID = string> {
+export interface TabViewProps<ID = string> {
     tabs: readonly Tab<ID>[];
     onTabChange: (id: ID) => void;
     selectedTab?: ID;
diff --git a/apps/admin-x-settings/src/admin-x-ds/global/Table.stories.tsx b/apps/admin-x-design-system/src/global/Table.stories.tsx
similarity index 100%
rename from apps/admin-x-settings/src/admin-x-ds/global/Table.stories.tsx
rename to apps/admin-x-design-system/src/global/Table.stories.tsx
diff --git a/apps/admin-x-settings/src/admin-x-ds/global/Table.tsx b/apps/admin-x-design-system/src/global/Table.tsx
similarity index 98%
rename from apps/admin-x-settings/src/admin-x-ds/global/Table.tsx
rename to apps/admin-x-design-system/src/global/Table.tsx
index 68db36fa239..e7d21055b21 100644
--- a/apps/admin-x-settings/src/admin-x-ds/global/Table.tsx
+++ b/apps/admin-x-design-system/src/global/Table.tsx
@@ -1,19 +1,19 @@
+import clsx from 'clsx';
+import React from 'react';
+import {PaginationData} from '../hooks/usePagination';
 import Heading from './Heading';
 import Hint from './Hint';
+import {LoadingIndicator} from './LoadingIndicator';
 import Pagination from './Pagination';
-import React from 'react';
 import Separator from './Separator';
 import TableRow from './TableRow';
-import clsx from 'clsx';
-import {LoadingIndicator} from './LoadingIndicator';
-import {PaginationData} from '../../hooks/usePagination';
 
 export interface ShowMoreData {
     hasMore: boolean;
     loadMore: () => void;
 }
 
-interface TableProps {
+export interface TableProps {
     /**
      * If the table is the primary content on a page (e.g. Members table) then you can set a pagetitle to be consistent
      */
diff --git a/apps/admin-x-settings/src/admin-x-ds/global/TableCell.tsx b/apps/admin-x-design-system/src/global/TableCell.tsx
similarity index 87%
rename from apps/admin-x-settings/src/admin-x-ds/global/TableCell.tsx
rename to apps/admin-x-design-system/src/global/TableCell.tsx
index 0e284261ba4..fe6e3bdcd2c 100644
--- a/apps/admin-x-settings/src/admin-x-ds/global/TableCell.tsx
+++ b/apps/admin-x-design-system/src/global/TableCell.tsx
@@ -1,7 +1,7 @@
-import React, {HTMLProps} from 'react';
 import clsx from 'clsx';
+import React, {HTMLProps} from 'react';
 
-interface TableCellProps extends HTMLProps<HTMLTableCellElement> {
+export interface TableCellProps extends HTMLProps<HTMLTableCellElement> {
     padding?: boolean;
 }
 
diff --git a/apps/admin-x-settings/src/admin-x-ds/global/TableHead.tsx b/apps/admin-x-design-system/src/global/TableHead.tsx
similarity index 71%
rename from apps/admin-x-settings/src/admin-x-ds/global/TableHead.tsx
rename to apps/admin-x-design-system/src/global/TableHead.tsx
index 78a6c0e0924..248cb7b625d 100644
--- a/apps/admin-x-settings/src/admin-x-ds/global/TableHead.tsx
+++ b/apps/admin-x-design-system/src/global/TableHead.tsx
@@ -1,8 +1,10 @@
-import Heading from './Heading';
-import React, {HTMLProps} from 'react';
 import clsx from 'clsx';
+import React, {HTMLProps} from 'react';
+import Heading from './Heading';
+
+export type TableHeadProps = HTMLProps<HTMLTableCellElement>
 
-const TableHead: React.FC<HTMLProps<HTMLTableCellElement>> = ({className, children, colSpan, ...props}) => {
+const TableHead: React.FC<TableHeadProps> = ({className, children, colSpan, ...props}) => {
     const tableCellClasses = clsx(
         '!py-2 !pl-0 !pr-6 text-left align-top',
         props.onClick && 'hover:cursor-pointer',
@@ -16,4 +18,4 @@ const TableHead: React.FC<HTMLProps<HTMLTableCellElement>> = ({className, childr
     );
 };
 
-export default TableHead;
\ No newline at end of file
+export default TableHead;
diff --git a/apps/admin-x-settings/src/admin-x-ds/global/TableRow.stories.tsx b/apps/admin-x-design-system/src/global/TableRow.stories.tsx
similarity index 100%
rename from apps/admin-x-settings/src/admin-x-ds/global/TableRow.stories.tsx
rename to apps/admin-x-design-system/src/global/TableRow.stories.tsx
diff --git a/apps/admin-x-settings/src/admin-x-ds/global/TableRow.tsx b/apps/admin-x-design-system/src/global/TableRow.tsx
similarity index 98%
rename from apps/admin-x-settings/src/admin-x-ds/global/TableRow.tsx
rename to apps/admin-x-design-system/src/global/TableRow.tsx
index bf7567ea647..d7831f34550 100644
--- a/apps/admin-x-settings/src/admin-x-ds/global/TableRow.tsx
+++ b/apps/admin-x-design-system/src/global/TableRow.tsx
@@ -1,7 +1,7 @@
-import React from 'react';
 import clsx from 'clsx';
+import React from 'react';
 
-interface TableRowProps {
+export interface TableRowProps {
     id?: string;
     action?: React.ReactNode;
     hideActions?: boolean;
diff --git a/apps/admin-x-settings/src/admin-x-ds/global/Toast.stories.tsx b/apps/admin-x-design-system/src/global/Toast.stories.tsx
similarity index 83%
rename from apps/admin-x-settings/src/admin-x-ds/global/Toast.stories.tsx
rename to apps/admin-x-design-system/src/global/Toast.stories.tsx
index f806ef499cd..6609b6c0b9f 100644
--- a/apps/admin-x-settings/src/admin-x-ds/global/Toast.stories.tsx
+++ b/apps/admin-x-design-system/src/global/Toast.stories.tsx
@@ -1,8 +1,19 @@
-import {ReactNode} from 'react';
 import type {Meta, StoryObj} from '@storybook/react';
+import {ReactNode} from 'react';
 
-import ToastContainer from './ToastContainer';
 import {Toaster} from 'react-hot-toast';
+import Button from './Button';
+import {ShowToastProps, showToast} from './Toast';
+
+const ToastContainer: React.FC<ShowToastProps> = ({...props}) => {
+    return (
+        <>
+            <Button color='black' label='Toast me!' onClick={() => {
+                showToast({...props});
+            }} />
+        </>
+    );
+};
 
 const meta = {
     title: 'Global / Toast',
diff --git a/apps/admin-x-settings/src/admin-x-ds/global/Toast.tsx b/apps/admin-x-design-system/src/global/Toast.tsx
similarity index 98%
rename from apps/admin-x-settings/src/admin-x-ds/global/Toast.tsx
rename to apps/admin-x-design-system/src/global/Toast.tsx
index 0287abba596..2ca15b19edf 100644
--- a/apps/admin-x-settings/src/admin-x-ds/global/Toast.tsx
+++ b/apps/admin-x-design-system/src/global/Toast.tsx
@@ -1,7 +1,7 @@
-import Icon from './Icon';
-import React from 'react';
 import clsx from 'clsx';
+import React from 'react';
 import {Toast as HotToast, ToastOptions, toast} from 'react-hot-toast';
+import Icon from './Icon';
 
 export type ToastType = 'neutral' | 'success' | 'error' | 'pageError';
 
@@ -12,7 +12,7 @@ export interface ShowToastProps {
     options?: ToastOptions
 }
 
-interface ToastProps {
+export interface ToastProps {
     t: HotToast;
 
     /**
diff --git a/apps/admin-x-settings/src/admin-x-ds/global/Tooltip.stories.tsx b/apps/admin-x-design-system/src/global/Tooltip.stories.tsx
similarity index 100%
rename from apps/admin-x-settings/src/admin-x-ds/global/Tooltip.stories.tsx
rename to apps/admin-x-design-system/src/global/Tooltip.stories.tsx
diff --git a/apps/admin-x-settings/src/admin-x-ds/global/Tooltip.tsx b/apps/admin-x-design-system/src/global/Tooltip.tsx
similarity index 95%
rename from apps/admin-x-settings/src/admin-x-ds/global/Tooltip.tsx
rename to apps/admin-x-design-system/src/global/Tooltip.tsx
index 0f5a1d1a699..68a7ad3152f 100644
--- a/apps/admin-x-settings/src/admin-x-ds/global/Tooltip.tsx
+++ b/apps/admin-x-design-system/src/global/Tooltip.tsx
@@ -1,7 +1,7 @@
-import React from 'react';
 import clsx from 'clsx';
+import React from 'react';
 
-interface TooltipProps {
+export interface TooltipProps {
     content?: React.ReactNode;
     size?: 'sm' | 'md';
     children?: React.ReactNode;
@@ -33,4 +33,4 @@ const Tooltip: React.FC<TooltipProps> = ({content, size = 'sm', children, contai
     );
 };
 
-export default Tooltip;
\ No newline at end of file
+export default Tooltip;
diff --git a/apps/admin-x-settings/src/admin-x-ds/global/chrome/DesktopChrome.stories.tsx b/apps/admin-x-design-system/src/global/chrome/DesktopChrome.stories.tsx
similarity index 100%
rename from apps/admin-x-settings/src/admin-x-ds/global/chrome/DesktopChrome.stories.tsx
rename to apps/admin-x-design-system/src/global/chrome/DesktopChrome.stories.tsx
diff --git a/apps/admin-x-settings/src/admin-x-ds/global/chrome/DesktopChrome.tsx b/apps/admin-x-design-system/src/global/chrome/DesktopChrome.tsx
similarity index 92%
rename from apps/admin-x-settings/src/admin-x-ds/global/chrome/DesktopChrome.tsx
rename to apps/admin-x-design-system/src/global/chrome/DesktopChrome.tsx
index 73ed6323b0d..223385f9050 100644
--- a/apps/admin-x-settings/src/admin-x-ds/global/chrome/DesktopChrome.tsx
+++ b/apps/admin-x-design-system/src/global/chrome/DesktopChrome.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 
-interface DesktopChromeProps {
+export interface DesktopChromeProps {
     children?: React.ReactNode;
 }
 
diff --git a/apps/admin-x-settings/src/admin-x-ds/global/chrome/DesktopChromeHeader.stories.tsx b/apps/admin-x-design-system/src/global/chrome/DesktopChromeHeader.stories.tsx
similarity index 100%
rename from apps/admin-x-settings/src/admin-x-ds/global/chrome/DesktopChromeHeader.stories.tsx
rename to apps/admin-x-design-system/src/global/chrome/DesktopChromeHeader.stories.tsx
diff --git a/apps/admin-x-settings/src/admin-x-ds/global/chrome/DesktopChromeHeader.tsx b/apps/admin-x-design-system/src/global/chrome/DesktopChromeHeader.tsx
similarity index 98%
rename from apps/admin-x-settings/src/admin-x-ds/global/chrome/DesktopChromeHeader.tsx
rename to apps/admin-x-design-system/src/global/chrome/DesktopChromeHeader.tsx
index ce7cd87fd4a..f69131195cb 100644
--- a/apps/admin-x-settings/src/admin-x-ds/global/chrome/DesktopChromeHeader.tsx
+++ b/apps/admin-x-design-system/src/global/chrome/DesktopChromeHeader.tsx
@@ -2,7 +2,7 @@ import React from 'react';
 
 export type DesktopChromeHeaderSize = 'sm' | 'md' | 'lg';
 
-interface DesktopChromeHeaderProps {
+export interface DesktopChromeHeaderProps {
     size?: DesktopChromeHeaderSize;
     toolbarLeft?: React.ReactNode;
     toolbarCenter?: React.ReactNode;
diff --git a/apps/admin-x-settings/src/admin-x-ds/global/chrome/MobileChrome.stories.tsx b/apps/admin-x-design-system/src/global/chrome/MobileChrome.stories.tsx
similarity index 100%
rename from apps/admin-x-settings/src/admin-x-ds/global/chrome/MobileChrome.stories.tsx
rename to apps/admin-x-design-system/src/global/chrome/MobileChrome.stories.tsx
diff --git a/apps/admin-x-settings/src/admin-x-ds/global/chrome/MobileChrome.tsx b/apps/admin-x-design-system/src/global/chrome/MobileChrome.tsx
similarity index 93%
rename from apps/admin-x-settings/src/admin-x-ds/global/chrome/MobileChrome.tsx
rename to apps/admin-x-design-system/src/global/chrome/MobileChrome.tsx
index 7a6a92552ff..de60f7e560a 100644
--- a/apps/admin-x-settings/src/admin-x-ds/global/chrome/MobileChrome.tsx
+++ b/apps/admin-x-design-system/src/global/chrome/MobileChrome.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 
-interface MobileChromeProps {
+export interface MobileChromeProps {
     children?: React.ReactNode;
 }
 
diff --git a/apps/admin-x-settings/src/admin-x-ds/global/form/Checkbox.stories.tsx b/apps/admin-x-design-system/src/global/form/Checkbox.stories.tsx
similarity index 100%
rename from apps/admin-x-settings/src/admin-x-ds/global/form/Checkbox.stories.tsx
rename to apps/admin-x-design-system/src/global/form/Checkbox.stories.tsx
diff --git a/apps/admin-x-settings/src/admin-x-ds/global/form/Checkbox.tsx b/apps/admin-x-design-system/src/global/form/Checkbox.tsx
similarity index 100%
rename from apps/admin-x-settings/src/admin-x-ds/global/form/Checkbox.tsx
rename to apps/admin-x-design-system/src/global/form/Checkbox.tsx
diff --git a/apps/admin-x-settings/src/admin-x-ds/global/form/CheckboxGroup.stories.tsx b/apps/admin-x-design-system/src/global/form/CheckboxGroup.stories.tsx
similarity index 100%
rename from apps/admin-x-settings/src/admin-x-ds/global/form/CheckboxGroup.stories.tsx
rename to apps/admin-x-design-system/src/global/form/CheckboxGroup.stories.tsx
diff --git a/apps/admin-x-settings/src/admin-x-ds/global/form/CheckboxGroup.tsx b/apps/admin-x-design-system/src/global/form/CheckboxGroup.tsx
similarity index 92%
rename from apps/admin-x-settings/src/admin-x-ds/global/form/CheckboxGroup.tsx
rename to apps/admin-x-design-system/src/global/form/CheckboxGroup.tsx
index bdf25e5f71f..bccf54bbfcd 100644
--- a/apps/admin-x-settings/src/admin-x-ds/global/form/CheckboxGroup.tsx
+++ b/apps/admin-x-design-system/src/global/form/CheckboxGroup.tsx
@@ -1,9 +1,9 @@
-import Checkbox, {CheckboxProps} from './Checkbox';
+import React from 'react';
 import Heading from '../Heading';
 import Hint from '../Hint';
-import React from 'react';
+import Checkbox, {CheckboxProps} from './Checkbox';
 
-interface CheckboxGroupProps {
+export interface CheckboxGroupProps {
     title?: string;
     checkboxes?: CheckboxProps[];
     hint?: string;
@@ -31,4 +31,4 @@ const CheckboxGroup: React.FC<CheckboxGroupProps> = ({
     );
 };
 
-export default CheckboxGroup;
\ No newline at end of file
+export default CheckboxGroup;
diff --git a/apps/admin-x-settings/src/admin-x-ds/global/form/CodeEditor.stories.tsx b/apps/admin-x-design-system/src/global/form/CodeEditor.stories.tsx
similarity index 100%
rename from apps/admin-x-settings/src/admin-x-ds/global/form/CodeEditor.stories.tsx
rename to apps/admin-x-design-system/src/global/form/CodeEditor.stories.tsx
diff --git a/apps/admin-x-settings/src/admin-x-ds/global/form/CodeEditor.tsx b/apps/admin-x-design-system/src/global/form/CodeEditor.tsx
similarity index 84%
rename from apps/admin-x-settings/src/admin-x-ds/global/form/CodeEditor.tsx
rename to apps/admin-x-design-system/src/global/form/CodeEditor.tsx
index 2a4f382c3b4..376a2bd1ead 100644
--- a/apps/admin-x-settings/src/admin-x-ds/global/form/CodeEditor.tsx
+++ b/apps/admin-x-design-system/src/global/form/CodeEditor.tsx
@@ -1,9 +1,11 @@
-import React, {Suspense, forwardRef} from 'react';
-import type {CodeEditorProps} from './CodeEditorView.tsx';
 import type {ReactCodeMirrorRef} from '@uiw/react-codemirror';
+import React, {Suspense, forwardRef} from 'react';
+import type {CodeEditorProps} from './CodeEditorView';
+
+export type {CodeEditorProps};
 
 // Imported asynchronously to avoid including CodeMirror in the main bundle
-const CodeEditorView = React.lazy(() => import('./CodeEditorView.tsx'));
+const CodeEditorView = React.lazy(() => import('./CodeEditorView'));
 
 const CodeEditor = forwardRef<ReactCodeMirrorRef, CodeEditorProps>(function CodeEditor(props, ref) {
     return (
diff --git a/apps/admin-x-settings/src/admin-x-ds/global/form/CodeEditorView.tsx b/apps/admin-x-design-system/src/global/form/CodeEditorView.tsx
similarity index 99%
rename from apps/admin-x-settings/src/admin-x-ds/global/form/CodeEditorView.tsx
rename to apps/admin-x-design-system/src/global/form/CodeEditorView.tsx
index f48c9a1c335..207b71bd393 100644
--- a/apps/admin-x-settings/src/admin-x-ds/global/form/CodeEditorView.tsx
+++ b/apps/admin-x-design-system/src/global/form/CodeEditorView.tsx
@@ -1,10 +1,10 @@
+import {Extension} from '@codemirror/state';
 import CodeMirror, {ReactCodeMirrorProps, ReactCodeMirrorRef} from '@uiw/react-codemirror';
-import Heading from '../Heading';
-import Hint from '../Hint';
-import React, {FocusEventHandler, forwardRef, useEffect, useId, useRef, useState} from 'react';
 import clsx from 'clsx';
-import {Extension} from '@codemirror/state';
+import React, {FocusEventHandler, forwardRef, useEffect, useId, useRef, useState} from 'react';
 import {useFocusContext} from '../../providers/DesignSystemProvider';
+import Heading from '../Heading';
+import Hint from '../Hint';
 
 export interface CodeEditorProps extends Omit<ReactCodeMirrorProps, 'value' | 'onChange' | 'extensions'> {
     title?: string;
@@ -75,7 +75,7 @@ const CodeEditorView = forwardRef<ReactCodeMirrorRef, CodeEditorProps>(function
         return () => resizeObserver.disconnect();
     }, []);
 
-    let styles = clsx(
+    const styles = clsx(
         'peer order-2 w-full max-w-full overflow-hidden rounded-sm border',
         clearBg ? 'bg-transparent' : 'bg-grey-75',
         error ? 'border-red' : 'border-grey-500 dark:border-grey-800',
diff --git a/apps/admin-x-settings/src/admin-x-ds/global/form/ColorIndicator.stories.tsx b/apps/admin-x-design-system/src/global/form/ColorIndicator.stories.tsx
similarity index 100%
rename from apps/admin-x-settings/src/admin-x-ds/global/form/ColorIndicator.stories.tsx
rename to apps/admin-x-design-system/src/global/form/ColorIndicator.stories.tsx
diff --git a/apps/admin-x-settings/src/admin-x-ds/global/form/ColorIndicator.tsx b/apps/admin-x-design-system/src/global/form/ColorIndicator.tsx
similarity index 94%
rename from apps/admin-x-settings/src/admin-x-ds/global/form/ColorIndicator.tsx
rename to apps/admin-x-design-system/src/global/form/ColorIndicator.tsx
index 6b17c112775..cb8dccce812 100644
--- a/apps/admin-x-settings/src/admin-x-ds/global/form/ColorIndicator.tsx
+++ b/apps/admin-x-design-system/src/global/form/ColorIndicator.tsx
@@ -1,6 +1,6 @@
-import Heading from '../Heading';
 import clsx from 'clsx';
 import {Fragment, MouseEvent, useRef} from 'react';
+import Heading from '../Heading';
 
 type SwatchSizes = 'md' | 'lg';
 
@@ -58,8 +58,7 @@ export type SwatchOption = {
     customContent?: JSX.Element;
 }
 
-/** Should usually be used via [ColorPickerField](?path=/docs/global-form-color-picker-field--docs) */
-const ColorIndicator: React.FC<{
+export interface ColorIndicatorProps {
     title?: string;
     value?: string | null;
     swatches: SwatchOption[];
@@ -69,8 +68,10 @@ const ColorIndicator: React.FC<{
     isExpanded: boolean;
     picker?: boolean;
     containerClassName?: string;
+}
 
-}> = ({title, value, swatches, swatchSize = 'md',onSwatchChange, onTogglePicker, isExpanded, picker = true, containerClassName}) => {
+/** Should usually be used via [ColorPickerField](?path=/docs/global-form-color-picker-field--docs) */
+const ColorIndicator: React.FC<ColorIndicatorProps> = ({title, value, swatches, swatchSize = 'md',onSwatchChange, onTogglePicker, isExpanded, picker = true, containerClassName}) => {
     let selectedSwatch = swatches.find(swatch => swatch.value === value || swatch.hex === value);
 
     if (isExpanded) {
diff --git a/apps/admin-x-settings/src/admin-x-ds/global/form/ColorPicker.stories.tsx b/apps/admin-x-design-system/src/global/form/ColorPicker.stories.tsx
similarity index 100%
rename from apps/admin-x-settings/src/admin-x-ds/global/form/ColorPicker.stories.tsx
rename to apps/admin-x-design-system/src/global/form/ColorPicker.stories.tsx
diff --git a/apps/admin-x-settings/src/admin-x-ds/global/form/ColorPicker.tsx b/apps/admin-x-design-system/src/global/form/ColorPicker.tsx
similarity index 96%
rename from apps/admin-x-settings/src/admin-x-ds/global/form/ColorPicker.tsx
rename to apps/admin-x-design-system/src/global/form/ColorPicker.tsx
index f939c1ce9d1..076bb0bf528 100644
--- a/apps/admin-x-settings/src/admin-x-ds/global/form/ColorPicker.tsx
+++ b/apps/admin-x-design-system/src/global/form/ColorPicker.tsx
@@ -1,8 +1,8 @@
-import Button from '../Button';
 import clsx from 'clsx';
-import {ReactComponent as EyedropperIcon} from '../../assets/icons/eyedropper.svg';
-import {HexColorInput, HexColorPicker} from 'react-colorful';
 import {MouseEvent, UIEvent, useCallback, useEffect, useRef} from 'react';
+import {HexColorInput, HexColorPicker} from 'react-colorful';
+import {ReactComponent as EyedropperIcon} from '../../assets/icons/eyedropper.svg';
+import Button from '../Button';
 
 declare global {
     interface Window {
@@ -15,14 +15,16 @@ declare global {
     }
 }
 
-/** Should usually be used via [ColorPickerField](?path=/docs/global-form-color-picker-field--docs) */
-const ColorPicker: React.FC<{
+export interface ColorPickerProps {
     hexValue?: string;
     eyedropper?: boolean;
     clearButtonValue?: string | null;
     containerClassName?: string;
     onChange?: (newValue: string | null) => void;
-}> = ({hexValue, eyedropper, clearButtonValue, containerClassName, onChange}) => {
+}
+
+/** Should usually be used via [ColorPickerField](?path=/docs/global-form-color-picker-field--docs) */
+const ColorPicker: React.FC<ColorPickerProps> = ({hexValue, eyedropper, clearButtonValue, containerClassName, onChange}) => {
     // HexColorInput doesn't support adding a ref on the input itself
     const inputWrapperRef = useRef<HTMLDivElement>(null);
 
diff --git a/apps/admin-x-settings/src/admin-x-ds/global/form/ColorPickerField.stories.tsx b/apps/admin-x-design-system/src/global/form/ColorPickerField.stories.tsx
similarity index 100%
rename from apps/admin-x-settings/src/admin-x-ds/global/form/ColorPickerField.stories.tsx
rename to apps/admin-x-design-system/src/global/form/ColorPickerField.stories.tsx
diff --git a/apps/admin-x-settings/src/admin-x-ds/global/form/ColorPickerField.tsx b/apps/admin-x-design-system/src/global/form/ColorPickerField.tsx
similarity index 91%
rename from apps/admin-x-settings/src/admin-x-ds/global/form/ColorPickerField.tsx
rename to apps/admin-x-design-system/src/global/form/ColorPickerField.tsx
index 1fe93aa24a7..5c2d2a9d353 100644
--- a/apps/admin-x-settings/src/admin-x-ds/global/form/ColorPickerField.tsx
+++ b/apps/admin-x-design-system/src/global/form/ColorPickerField.tsx
@@ -1,9 +1,9 @@
-import ColorIndicator, {SwatchOption} from './ColorIndicator';
-import ColorPicker from './ColorPicker';
 import clsx from 'clsx';
 import {ReactNode, createContext, useContext, useEffect, useId, useMemo, useState} from 'react';
+import {debounce} from '../../utils/debounce';
+import ColorIndicator, {SwatchOption} from './ColorIndicator';
+import ColorPicker from './ColorPicker';
 import {ToggleDirections} from './Toggle';
-import {debounce} from '../../../utils/debounce';
 
 const ColorPickerContext = createContext<{colorPickers: Array<{ id: string; setExpanded: ((expanded: boolean) => void) }>}>({
     colorPickers: []
@@ -17,7 +17,7 @@ const to6DigitHex = (hex: string) => {
     }
 };
 
-const ColorPickerField = ({testId, title, direction, value, hint, error, eyedropper, clearButtonValue, onChange, swatches = [], alwaysOpen = false, debounceMs}: {
+export interface ColorPickerFieldProps {
     testId?: string;
     title?: ReactNode;
     direction?: ToggleDirections;
@@ -30,7 +30,9 @@ const ColorPickerField = ({testId, title, direction, value, hint, error, eyedrop
     swatches?: SwatchOption[];
     alwaysOpen?: boolean;
     debounceMs?: number;
-}) => {
+}
+
+const ColorPickerField: React.FC<ColorPickerFieldProps> = ({testId, title, direction, value, hint, error, eyedropper, clearButtonValue, onChange, swatches = [], alwaysOpen = false, debounceMs}) => {
     const [isExpanded, setExpanded] = useState(false);
     const [localValue, setLocalValue] = useState(value);
     const context = useContext(ColorPickerContext);
@@ -112,7 +114,7 @@ const ColorPickerField = ({testId, title, direction, value, hint, error, eyedrop
         );
     }
 
-    let selectedSwatch = swatches.find(swatch => swatch.value === localValue);
+    const selectedSwatch = swatches.find(swatch => swatch.value === localValue);
 
     return (
         <div className="mt-2 flex-col" data-testid={testId} onClick={event => event.stopPropagation()}>
diff --git a/apps/admin-x-settings/src/admin-x-ds/global/form/CurrencyField.stories.tsx b/apps/admin-x-design-system/src/global/form/CurrencyField.stories.tsx
similarity index 100%
rename from apps/admin-x-settings/src/admin-x-ds/global/form/CurrencyField.stories.tsx
rename to apps/admin-x-design-system/src/global/form/CurrencyField.stories.tsx
diff --git a/apps/admin-x-settings/src/admin-x-ds/global/form/CurrencyField.tsx b/apps/admin-x-design-system/src/global/form/CurrencyField.tsx
similarity index 81%
rename from apps/admin-x-settings/src/admin-x-ds/global/form/CurrencyField.tsx
rename to apps/admin-x-design-system/src/global/form/CurrencyField.tsx
index 3c93adac951..aab17c34950 100644
--- a/apps/admin-x-settings/src/admin-x-ds/global/form/CurrencyField.tsx
+++ b/apps/admin-x-design-system/src/global/form/CurrencyField.tsx
@@ -1,6 +1,5 @@
 import React, {useState} from 'react';
 import TextField, {TextFieldProps} from './TextField';
-import {currencyFromDecimal, currencyToDecimal} from '../../../utils/currency';
 
 export type CurrencyFieldProps = Omit<TextFieldProps, 'type' | 'onChange' | 'value'> & {
     valueInCents?: number | '';
@@ -20,21 +19,21 @@ const CurrencyField: React.FC<CurrencyFieldProps> = ({
     onChange,
     ...props
 }) => {
-    const [localValue, setLocalValue] = useState(valueInCents === '' ? '' : currencyToDecimal(valueInCents || 0).toString());
+    const [localValue, setLocalValue] = useState(valueInCents === '' ? '' : ((valueInCents || 0) / 100).toString());
 
     // While the user is editing we allow more lenient input, e.g. "1.32.566" to make it easier to type and change
     const stripNonNumeric = (input: string) => input.replace(/[^\d.]+/g, '');
 
     // The saved value is strictly a number with 2 decimal places
     const forceCurrencyValue = (input: string) => {
-        return currencyFromDecimal(parseFloat(input.match(/[\d]+\.?[\d]{0,2}/)?.[0] || '0'));
+        return Math.floor(parseFloat(input.match(/[\d]+\.?[\d]{0,2}/)?.[0] || '0') * 100);
     };
 
     return <TextField
         {...props}
         value={localValue}
         onBlur={(e) => {
-            setLocalValue(currencyToDecimal(forceCurrencyValue(e.target.value)).toString());
+            setLocalValue((forceCurrencyValue(e.target.value) / 100).toString());
             props.onBlur?.(e);
         }}
         onChange={(e) => {
diff --git a/apps/admin-x-settings/src/admin-x-ds/global/form/FileUpload.stories.tsx b/apps/admin-x-design-system/src/global/form/FileUpload.stories.tsx
similarity index 100%
rename from apps/admin-x-settings/src/admin-x-ds/global/form/FileUpload.stories.tsx
rename to apps/admin-x-design-system/src/global/form/FileUpload.stories.tsx
diff --git a/apps/admin-x-settings/src/admin-x-ds/global/form/FileUpload.tsx b/apps/admin-x-design-system/src/global/form/FileUpload.tsx
similarity index 100%
rename from apps/admin-x-settings/src/admin-x-ds/global/form/FileUpload.tsx
rename to apps/admin-x-design-system/src/global/form/FileUpload.tsx
diff --git a/apps/admin-x-settings/src/admin-x-ds/global/form/Form.stories.tsx b/apps/admin-x-design-system/src/global/form/Form.stories.tsx
similarity index 100%
rename from apps/admin-x-settings/src/admin-x-ds/global/form/Form.stories.tsx
rename to apps/admin-x-design-system/src/global/form/Form.stories.tsx
diff --git a/apps/admin-x-settings/src/admin-x-ds/global/form/Form.tsx b/apps/admin-x-design-system/src/global/form/Form.tsx
similarity index 95%
rename from apps/admin-x-settings/src/admin-x-ds/global/form/Form.tsx
rename to apps/admin-x-design-system/src/global/form/Form.tsx
index ce2b79d3a78..d2378ca9f29 100644
--- a/apps/admin-x-settings/src/admin-x-ds/global/form/Form.tsx
+++ b/apps/admin-x-design-system/src/global/form/Form.tsx
@@ -1,8 +1,8 @@
-import Heading from '../Heading';
-import React from 'react';
 import clsx from 'clsx';
+import React from 'react';
+import Heading from '../Heading';
 
-interface FormProps {
+export interface FormProps {
     title?: string;
     grouped?: boolean;
     gap?: 'none' | 'sm' | 'md' | 'lg';
@@ -62,7 +62,7 @@ const Form: React.FC<FormProps> = ({
         );
     }
 
-    let titleClasses = clsx(
+    const titleClasses = clsx(
         grouped ? 'mb-3' : 'mb-4'
     );
 
@@ -84,4 +84,4 @@ const Form: React.FC<FormProps> = ({
     );
 };
 
-export default Form;
\ No newline at end of file
+export default Form;
diff --git a/apps/admin-x-settings/src/admin-x-ds/global/form/HtmlEditor.tsx b/apps/admin-x-design-system/src/global/form/HtmlEditor.tsx
similarity index 91%
rename from apps/admin-x-settings/src/admin-x-ds/global/form/HtmlEditor.tsx
rename to apps/admin-x-design-system/src/global/form/HtmlEditor.tsx
index ff4614b4d21..b64333324ff 100644
--- a/apps/admin-x-settings/src/admin-x-ds/global/form/HtmlEditor.tsx
+++ b/apps/admin-x-design-system/src/global/form/HtmlEditor.tsx
@@ -1,15 +1,18 @@
 import * as Sentry from '@sentry/react';
-import ErrorBoundary from '../ErrorBoundary';
 import React, {Suspense, useCallback, useMemo} from 'react';
-import {FetchKoenigLexical, useServices} from '../../../components/providers/ServiceProvider';
-import {useFocusContext} from '../../providers/DesignSystemProvider';
+import {useDesignSystem, useFocusContext} from '../../providers/DesignSystemProvider';
+import ErrorBoundary from '../ErrorBoundary';
+
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+export type FetchKoenigLexical = () => Promise<any>
 
 export interface HtmlEditorProps {
     value?: string
     onChange?: (html: string) => void
     onBlur?: () => void
     placeholder?: string
-    nodes?: 'DEFAULT_NODES' | 'BASIC_NODES' | 'MINIMAL_NODES';
+    nodes?: 'DEFAULT_NODES' | 'BASIC_NODES' | 'MINIMAL_NODES'
+    emojiPicker?: boolean;
 }
 
 declare global {
@@ -57,7 +60,8 @@ const KoenigWrapper: React.FC<HtmlEditorProps & { editor: EditorResource }> = ({
     onChange,
     onBlur,
     placeholder,
-    nodes
+    nodes,
+    emojiPicker = true
 }) => {
     const onError = useCallback((error: unknown) => {
         try {
@@ -139,6 +143,7 @@ const KoenigWrapper: React.FC<HtmlEditorProps & { editor: EditorResource }> = ({
                 onFocus={handleFocus}
             >
                 <koenig.HtmlOutputPlugin html={value} setHtml={handleSetHtml} />
+                {emojiPicker ? <koenig.EmojiPickerPlugin /> : null}
             </koenig.KoenigComposableEditor>
         </koenig.KoenigComposer>
     );
@@ -150,7 +155,7 @@ const HtmlEditor: React.FC<HtmlEditorProps & {
     className,
     ...props
 }) => {
-    const {fetchKoenigLexical} = useServices();
+    const {fetchKoenigLexical} = useDesignSystem();
     const editorResource = useMemo(() => loadKoenig(fetchKoenigLexical), [fetchKoenigLexical]);
 
     return <div className={className || 'w-full'}>
diff --git a/apps/admin-x-settings/src/admin-x-ds/global/form/HtmlField.stories.tsx b/apps/admin-x-design-system/src/global/form/HtmlField.stories.tsx
similarity index 100%
rename from apps/admin-x-settings/src/admin-x-ds/global/form/HtmlField.stories.tsx
rename to apps/admin-x-design-system/src/global/form/HtmlField.stories.tsx
diff --git a/apps/admin-x-settings/src/admin-x-ds/global/form/HtmlField.tsx b/apps/admin-x-design-system/src/global/form/HtmlField.tsx
similarity index 100%
rename from apps/admin-x-settings/src/admin-x-ds/global/form/HtmlField.tsx
rename to apps/admin-x-design-system/src/global/form/HtmlField.tsx
diff --git a/apps/admin-x-settings/src/admin-x-ds/global/form/ImageUpload.stories.tsx b/apps/admin-x-design-system/src/global/form/ImageUpload.stories.tsx
similarity index 100%
rename from apps/admin-x-settings/src/admin-x-ds/global/form/ImageUpload.stories.tsx
rename to apps/admin-x-design-system/src/global/form/ImageUpload.stories.tsx
diff --git a/apps/admin-x-settings/src/admin-x-ds/global/form/ImageUpload.tsx b/apps/admin-x-design-system/src/global/form/ImageUpload.tsx
similarity index 99%
rename from apps/admin-x-settings/src/admin-x-ds/global/form/ImageUpload.tsx
rename to apps/admin-x-design-system/src/global/form/ImageUpload.tsx
index 8966a56762c..1e2ac42d76a 100644
--- a/apps/admin-x-settings/src/admin-x-ds/global/form/ImageUpload.tsx
+++ b/apps/admin-x-design-system/src/global/form/ImageUpload.tsx
@@ -1,11 +1,11 @@
-import FileUpload, {FileUploadProps} from './FileUpload';
-import Icon from '../Icon';
-import React, {MouseEventHandler} from 'react';
 import clsx from 'clsx';
+import React, {MouseEventHandler} from 'react';
+import Icon from '../Icon';
+import FileUpload, {FileUploadProps} from './FileUpload';
 
 type ImageFit = 'cover' | 'contain' | 'fill' | 'scale-down' | 'none';
 
-interface ImageUploadProps {
+export interface ImageUploadProps {
     id: string;
     children?: React.ReactNode;
     width?: string;
diff --git a/apps/admin-x-settings/src/admin-x-ds/global/form/MultiSelect.stories.tsx b/apps/admin-x-design-system/src/global/form/MultiSelect.stories.tsx
similarity index 100%
rename from apps/admin-x-settings/src/admin-x-ds/global/form/MultiSelect.stories.tsx
rename to apps/admin-x-design-system/src/global/form/MultiSelect.stories.tsx
diff --git a/apps/admin-x-settings/src/admin-x-ds/global/form/MultiSelect.tsx b/apps/admin-x-design-system/src/global/form/MultiSelect.tsx
similarity index 95%
rename from apps/admin-x-settings/src/admin-x-ds/global/form/MultiSelect.tsx
rename to apps/admin-x-design-system/src/global/form/MultiSelect.tsx
index 7ae9ee5dff5..833579a8cfd 100644
--- a/apps/admin-x-settings/src/admin-x-ds/global/form/MultiSelect.tsx
+++ b/apps/admin-x-design-system/src/global/form/MultiSelect.tsx
@@ -1,11 +1,11 @@
-import AsyncCreatableSelect from 'react-select/async-creatable';
+import clsx from 'clsx';
+import React, {useId, useMemo} from 'react';
+import {DropdownIndicatorProps, GroupBase, MultiValue, OptionProps, OptionsOrGroups, Props, default as ReactSelect, components} from 'react-select';
 import AsyncSelect from 'react-select/async';
+import AsyncCreatableSelect from 'react-select/async-creatable';
 import CreatableSelect from 'react-select/creatable';
 import Heading from '../Heading';
 import Hint from '../Hint';
-import React, {useId, useMemo} from 'react';
-import clsx from 'clsx';
-import {DropdownIndicatorProps, GroupBase, MultiValue, OptionProps, OptionsOrGroups, Props, default as ReactSelect, components} from 'react-select';
 
 export type MultiSelectColor = 'grey' | 'black' | 'green' | 'pink';
 type FieldStyles = 'text' | 'dropdown';
@@ -16,12 +16,12 @@ export type MultiSelectOption = {
     color?: MultiSelectColor;
 }
 
-export type LoadOptions = (inputValue: string, callback: (options: OptionsOrGroups<MultiSelectOption, GroupBase<MultiSelectOption>>) => void) => void
+export type LoadMultiSelectOptions = (inputValue: string, callback: (options: OptionsOrGroups<MultiSelectOption, GroupBase<MultiSelectOption>>) => void) => void
 
 type MultiSelectOptionProps = {
     async: true;
     defaultOptions: boolean | OptionsOrGroups<MultiSelectOption, GroupBase<MultiSelectOption>>;
-    loadOptions: LoadOptions;
+    loadOptions: LoadMultiSelectOptions;
     options?: never;
 } | {
     async?: false;
@@ -30,7 +30,7 @@ type MultiSelectOptionProps = {
     loadOptions?: never;
 }
 
-type MultiSelectProps = MultiSelectOptionProps & {
+export type MultiSelectProps = MultiSelectOptionProps & {
     values: MultiValue<MultiSelectOption>;
     title?: string;
     clearBg?: boolean;
diff --git a/apps/admin-x-settings/src/admin-x-ds/global/form/Radio.stories.tsx b/apps/admin-x-design-system/src/global/form/Radio.stories.tsx
similarity index 100%
rename from apps/admin-x-settings/src/admin-x-ds/global/form/Radio.stories.tsx
rename to apps/admin-x-design-system/src/global/form/Radio.stories.tsx
diff --git a/apps/admin-x-settings/src/admin-x-ds/global/form/Radio.tsx b/apps/admin-x-design-system/src/global/form/Radio.tsx
similarity index 98%
rename from apps/admin-x-settings/src/admin-x-ds/global/form/Radio.tsx
rename to apps/admin-x-design-system/src/global/form/Radio.tsx
index f260919e030..58f36eb38eb 100644
--- a/apps/admin-x-settings/src/admin-x-ds/global/form/Radio.tsx
+++ b/apps/admin-x-design-system/src/global/form/Radio.tsx
@@ -1,6 +1,6 @@
+import React from 'react';
 import Heading from '../Heading';
 import Hint from '../Hint';
-import React from 'react';
 import Separator from '../Separator';
 
 export interface RadioOption {
@@ -9,7 +9,7 @@ export interface RadioOption {
     hint?: React.ReactNode;
 }
 
-interface RadioProps {
+export interface RadioProps {
     id: string;
     title?: string;
     selectedOption?: string;
diff --git a/apps/admin-x-settings/src/admin-x-ds/global/form/Select.stories.tsx b/apps/admin-x-design-system/src/global/form/Select.stories.tsx
similarity index 100%
rename from apps/admin-x-settings/src/admin-x-ds/global/form/Select.stories.tsx
rename to apps/admin-x-design-system/src/global/form/Select.stories.tsx
diff --git a/apps/admin-x-settings/src/admin-x-ds/global/form/Select.tsx b/apps/admin-x-design-system/src/global/form/Select.tsx
similarity index 97%
rename from apps/admin-x-settings/src/admin-x-ds/global/form/Select.tsx
rename to apps/admin-x-design-system/src/global/form/Select.tsx
index 14a2cf11b01..1ec2c8d471e 100644
--- a/apps/admin-x-settings/src/admin-x-ds/global/form/Select.tsx
+++ b/apps/admin-x-design-system/src/global/form/Select.tsx
@@ -1,11 +1,11 @@
+import clsx from 'clsx';
+import React, {useId, useMemo} from 'react';
+import ReactSelect, {ClearIndicatorProps, DropdownIndicatorProps, GroupBase, OptionProps, OptionsOrGroups, Props, components} from 'react-select';
 import AsyncSelect from 'react-select/async';
+import {useFocusContext} from '../../providers/DesignSystemProvider';
 import Heading from '../Heading';
 import Hint from '../Hint';
 import Icon from '../Icon';
-import React, {useId, useMemo} from 'react';
-import ReactSelect, {ClearIndicatorProps, DropdownIndicatorProps, GroupBase, OptionProps, OptionsOrGroups, Props, components} from 'react-select';
-import clsx from 'clsx';
-import {useFocusContext} from '../../providers/DesignSystemProvider';
 
 export interface SelectOption {
     value: string;
@@ -32,12 +32,12 @@ export interface SelectControlClasses {
     clearIndicator?: string;
 }
 
-export type LoadOptions = (inputValue: string, callback: (options: OptionsOrGroups<SelectOption, GroupBase<SelectOption>>) => void) => void
+export type LoadSelectOptions = (inputValue: string, callback: (options: OptionsOrGroups<SelectOption, GroupBase<SelectOption>>) => void) => void
 
 type SelectOptionProps = {
     async: true;
     defaultOptions: boolean | OptionsOrGroups<SelectOption, GroupBase<SelectOption>>;
-    loadOptions: LoadOptions;
+    loadOptions: LoadSelectOptions;
     options?: never;
 } | {
     async?: false;
diff --git a/apps/admin-x-settings/src/admin-x-ds/global/form/TextArea.stories.tsx b/apps/admin-x-design-system/src/global/form/TextArea.stories.tsx
similarity index 100%
rename from apps/admin-x-settings/src/admin-x-ds/global/form/TextArea.stories.tsx
rename to apps/admin-x-design-system/src/global/form/TextArea.stories.tsx
diff --git a/apps/admin-x-settings/src/admin-x-ds/global/form/TextArea.tsx b/apps/admin-x-design-system/src/global/form/TextArea.tsx
similarity index 97%
rename from apps/admin-x-settings/src/admin-x-ds/global/form/TextArea.tsx
rename to apps/admin-x-design-system/src/global/form/TextArea.tsx
index 8025b0d22a1..163ebb1b35a 100644
--- a/apps/admin-x-settings/src/admin-x-ds/global/form/TextArea.tsx
+++ b/apps/admin-x-design-system/src/global/form/TextArea.tsx
@@ -1,14 +1,14 @@
 import React, {FocusEventHandler, HTMLProps, useId} from 'react';
 
-import Heading from '../Heading';
-import Hint from '../Hint';
 import clsx from 'clsx';
 import {useFocusContext} from '../../providers/DesignSystemProvider';
+import Heading from '../Heading';
+import Hint from '../Hint';
 
 type ResizeOptions = 'both' | 'vertical' | 'horizontal' | 'none';
 type FontStyles = 'sans' | 'mono';
 
-interface TextAreaProps extends HTMLProps<HTMLTextAreaElement> {
+export interface TextAreaProps extends HTMLProps<HTMLTextAreaElement> {
     inputRef?: React.RefObject<HTMLTextAreaElement>;
     title?: string;
     value?: string;
diff --git a/apps/admin-x-settings/src/admin-x-ds/global/form/TextField.stories.tsx b/apps/admin-x-design-system/src/global/form/TextField.stories.tsx
similarity index 100%
rename from apps/admin-x-settings/src/admin-x-ds/global/form/TextField.stories.tsx
rename to apps/admin-x-design-system/src/global/form/TextField.stories.tsx
diff --git a/apps/admin-x-settings/src/admin-x-ds/global/form/TextField.tsx b/apps/admin-x-design-system/src/global/form/TextField.tsx
similarity index 97%
rename from apps/admin-x-settings/src/admin-x-ds/global/form/TextField.tsx
rename to apps/admin-x-design-system/src/global/form/TextField.tsx
index ee8d6f30e56..e6407214414 100644
--- a/apps/admin-x-settings/src/admin-x-ds/global/form/TextField.tsx
+++ b/apps/admin-x-design-system/src/global/form/TextField.tsx
@@ -68,7 +68,7 @@ const TextField: React.FC<TextFieldProps> = ({
         (title && !hideTitle) && `mt-1.5`
     );
 
-    const bgClasses = clsx(
+    const bgClasses = !unstyled && clsx(
         'absolute inset-0 rounded-md border text-grey-300 transition-all peer-hover:bg-grey-100 peer-focus:border-green peer-focus:bg-white peer-focus:shadow-[0_0_0_1px_rgba(48,207,67,1)] dark:peer-hover:bg-grey-925 dark:peer-focus:bg-grey-925',
         error ? `border-red bg-white dark:bg-grey-925` : 'border-transparent bg-grey-150 dark:bg-grey-900',
         disabled && 'bg-grey-100 dark:bg-grey-925'
@@ -107,7 +107,7 @@ const TextField: React.FC<TextFieldProps> = ({
     field = (
         <div className={fieldContainerClasses}>
             {inputField}
-            {!clearBg && <div className={bgClasses}></div>}
+            {!unstyled && !clearBg && <div className={bgClasses ? bgClasses : ''}></div>}
             {rightPlaceholder && <span className={rightPlaceholderClasses || ''}>{rightPlaceholder}</span>}
         </div>
     );
diff --git a/apps/admin-x-settings/src/admin-x-ds/global/form/Toggle.stories.tsx b/apps/admin-x-design-system/src/global/form/Toggle.stories.tsx
similarity index 100%
rename from apps/admin-x-settings/src/admin-x-ds/global/form/Toggle.stories.tsx
rename to apps/admin-x-design-system/src/global/form/Toggle.stories.tsx
diff --git a/apps/admin-x-settings/src/admin-x-ds/global/form/Toggle.tsx b/apps/admin-x-design-system/src/global/form/Toggle.tsx
similarity index 99%
rename from apps/admin-x-settings/src/admin-x-ds/global/form/Toggle.tsx
rename to apps/admin-x-design-system/src/global/form/Toggle.tsx
index 9ed8f6b1591..5a056cd21a7 100644
--- a/apps/admin-x-settings/src/admin-x-ds/global/form/Toggle.tsx
+++ b/apps/admin-x-design-system/src/global/form/Toggle.tsx
@@ -1,12 +1,12 @@
-import React, {useId} from 'react';
-import Separator from '../Separator';
 import clsx from 'clsx';
+import React, {useId} from 'react';
 import {Heading6StylesGrey} from '../Heading';
+import Separator from '../Separator';
 
 type ToggleSizes = 'sm' | 'md' | 'lg';
 export type ToggleDirections = 'ltr' | 'rtl';
 
-interface ToggleProps {
+export interface ToggleProps {
     checked?: boolean;
     disabled?: boolean;
     error?: boolean;
diff --git a/apps/admin-x-settings/src/admin-x-ds/global/form/ToggleGroup.stories.tsx b/apps/admin-x-design-system/src/global/form/ToggleGroup.stories.tsx
similarity index 100%
rename from apps/admin-x-settings/src/admin-x-ds/global/form/ToggleGroup.stories.tsx
rename to apps/admin-x-design-system/src/global/form/ToggleGroup.stories.tsx
diff --git a/apps/admin-x-settings/src/admin-x-ds/global/form/ToggleGroup.tsx b/apps/admin-x-design-system/src/global/form/ToggleGroup.tsx
similarity index 92%
rename from apps/admin-x-settings/src/admin-x-ds/global/form/ToggleGroup.tsx
rename to apps/admin-x-design-system/src/global/form/ToggleGroup.tsx
index 01258dd8fb4..e1ad3fa2448 100644
--- a/apps/admin-x-settings/src/admin-x-ds/global/form/ToggleGroup.tsx
+++ b/apps/admin-x-design-system/src/global/form/ToggleGroup.tsx
@@ -1,7 +1,7 @@
-import React from 'react';
 import clsx from 'clsx';
+import React from 'react';
 
-interface ToggleGroupProps {
+export interface ToggleGroupProps {
     children?: React.ReactNode;
     gap?: 'sm' | 'md' | 'lg';
     className?: string;
@@ -40,4 +40,4 @@ const ToggleGroup: React.FC<ToggleGroupProps> = ({children, gap = 'md', classNam
     );
 };
 
-export default ToggleGroup;
\ No newline at end of file
+export default ToggleGroup;
diff --git a/apps/admin-x-settings/src/admin-x-ds/global/form/URLTextField.stories.tsx b/apps/admin-x-design-system/src/global/form/URLTextField.stories.tsx
similarity index 100%
rename from apps/admin-x-settings/src/admin-x-ds/global/form/URLTextField.stories.tsx
rename to apps/admin-x-design-system/src/global/form/URLTextField.stories.tsx
diff --git a/apps/admin-x-settings/src/admin-x-ds/global/form/URLTextField.tsx b/apps/admin-x-design-system/src/global/form/URLTextField.tsx
similarity index 96%
rename from apps/admin-x-settings/src/admin-x-ds/global/form/URLTextField.tsx
rename to apps/admin-x-design-system/src/global/form/URLTextField.tsx
index d25c509e8c1..05ff1677a75 100644
--- a/apps/admin-x-settings/src/admin-x-ds/global/form/URLTextField.tsx
+++ b/apps/admin-x-design-system/src/global/form/URLTextField.tsx
@@ -1,7 +1,7 @@
 import React, {useEffect, useState} from 'react';
-import TextField, {TextFieldProps} from './TextField';
 import validator from 'validator';
 import {useFocusContext} from '../../providers/DesignSystemProvider';
+import TextField, {TextFieldProps} from './TextField';
 
 export const formatUrl = (value: string, baseUrl?: string, nullable?: boolean) => {
     if (nullable && !value) {
@@ -93,6 +93,14 @@ export const formatUrl = (value: string, baseUrl?: string, nullable?: boolean) =
     return {save: url, display: new URL(url, baseUrl).toString()};
 };
 
+export interface URLTextFieldProps extends Omit<TextFieldProps, 'value' | 'onChange'> {
+    baseUrl?: string;
+    transformPathWithoutSlash?: boolean;
+    nullable?: boolean;
+    value: string | null;
+    onChange: (value: string | null) => void;
+}
+
 /**
  * A text field that displays and saves relative URLs as absolute relative to a given base URL (probably the site URL).
  *
@@ -102,13 +110,7 @@ export const formatUrl = (value: string, baseUrl?: string, nullable?: boolean) =
  * - Anchor links are displayed and saved as-is (e.g. `#test`)
  * - Values that don't look like URLs are displayed and saved as-is (e.g. `test`)
  */
-const URLTextField: React.FC<Omit<TextFieldProps, 'value' | 'onChange'> & {
-    baseUrl?: string;
-    transformPathWithoutSlash?: boolean;
-    nullable?: boolean;
-    value: string | null;
-    onChange: (value: string | null) => void;
-}> = ({baseUrl, value, transformPathWithoutSlash, nullable, onChange, ...props}) => {
+const URLTextField: React.FC<URLTextFieldProps> = ({baseUrl, value, transformPathWithoutSlash, nullable, onChange, ...props}) => {
     const [displayedUrl, setDisplayedUrl] = useState('');
     const {setFocusState} = useFocusContext();
 
diff --git a/apps/admin-x-settings/src/admin-x-ds/global/layout/PageHeader.stories.tsx b/apps/admin-x-design-system/src/global/layout/PageHeader.stories.tsx
similarity index 100%
rename from apps/admin-x-settings/src/admin-x-ds/global/layout/PageHeader.stories.tsx
rename to apps/admin-x-design-system/src/global/layout/PageHeader.stories.tsx
diff --git a/apps/admin-x-settings/src/admin-x-ds/global/layout/PageHeader.tsx b/apps/admin-x-design-system/src/global/layout/PageHeader.tsx
similarity index 97%
rename from apps/admin-x-settings/src/admin-x-ds/global/layout/PageHeader.tsx
rename to apps/admin-x-design-system/src/global/layout/PageHeader.tsx
index bfe36f5bf76..1eed829cf6b 100644
--- a/apps/admin-x-settings/src/admin-x-ds/global/layout/PageHeader.tsx
+++ b/apps/admin-x-design-system/src/global/layout/PageHeader.tsx
@@ -1,7 +1,7 @@
-import React from 'react';
 import clsx from 'clsx';
+import React from 'react';
 
-interface PageHeaderProps {
+export interface PageHeaderProps {
 
     /**
      * Use these to specifically place elements on the left | center | right of the header.
@@ -74,4 +74,4 @@ const PageHeader: React.FC<PageHeaderProps> = ({
     );
 };
 
-export default PageHeader;
\ No newline at end of file
+export default PageHeader;
diff --git a/apps/admin-x-settings/src/admin-x-ds/global/modal/ConfirmationModal.stories.tsx b/apps/admin-x-design-system/src/global/modal/ConfirmationModal.stories.tsx
similarity index 72%
rename from apps/admin-x-settings/src/admin-x-ds/global/modal/ConfirmationModal.stories.tsx
rename to apps/admin-x-design-system/src/global/modal/ConfirmationModal.stories.tsx
index 3355112e857..0bddd41df45 100644
--- a/apps/admin-x-settings/src/admin-x-ds/global/modal/ConfirmationModal.stories.tsx
+++ b/apps/admin-x-design-system/src/global/modal/ConfirmationModal.stories.tsx
@@ -1,9 +1,17 @@
-import {ReactNode} from 'react';
 import type {Meta, StoryContext, StoryObj} from '@storybook/react';
+import {ReactNode} from 'react';
 
-import ConfirmationModal from './ConfirmationModal';
-import ConfirmationModalContainer from './ConfirmationModalContainer';
 import NiceModal from '@ebay/nice-modal-react';
+import Button from '../Button';
+import ConfirmationModal, {ConfirmationModalProps} from './ConfirmationModal';
+
+const ConfirmationModalContainer: React.FC<ConfirmationModalProps> = ({...props}) => {
+    return (
+        <Button color='black' label='Open confirmation modal' onClick={() => {
+            NiceModal.show(ConfirmationModal, {...props});
+        }} />
+    );
+};
 
 const meta = {
     title: 'Global / Modal / Confirmation Modal',
diff --git a/apps/admin-x-settings/src/admin-x-ds/global/modal/ConfirmationModal.tsx b/apps/admin-x-design-system/src/global/modal/ConfirmationModal.tsx
similarity index 98%
rename from apps/admin-x-settings/src/admin-x-ds/global/modal/ConfirmationModal.tsx
rename to apps/admin-x-design-system/src/global/modal/ConfirmationModal.tsx
index 3867a2d07c1..4eeeb05458c 100644
--- a/apps/admin-x-settings/src/admin-x-ds/global/modal/ConfirmationModal.tsx
+++ b/apps/admin-x-design-system/src/global/modal/ConfirmationModal.tsx
@@ -41,9 +41,9 @@ export const ConfirmationModalContent: React.FC<ConfirmationModalProps> = ({
             formSheet={formSheet}
             okColor={okColor}
             okLabel={taskState === 'running' ? okRunningLabel : okLabel}
-            size={540}
             testId='confirmation-modal'
             title={title}
+            width={540}
             onCancel={onCancel}
             onOk={async () => {
                 setTaskState('running');
diff --git a/apps/admin-x-settings/src/admin-x-ds/global/modal/LimitModal.tsx b/apps/admin-x-design-system/src/global/modal/LimitModal.tsx
similarity index 78%
rename from apps/admin-x-settings/src/admin-x-ds/global/modal/LimitModal.tsx
rename to apps/admin-x-design-system/src/global/modal/LimitModal.tsx
index bd4b1a9e3ed..cc68af1cd3d 100644
--- a/apps/admin-x-settings/src/admin-x-ds/global/modal/LimitModal.tsx
+++ b/apps/admin-x-design-system/src/global/modal/LimitModal.tsx
@@ -1,32 +1,32 @@
-import Modal from './Modal';
 import NiceModal from '@ebay/nice-modal-react';
 import React from 'react';
-import useRouting from '../../../hooks/useRouting';
+import Modal from './Modal';
 
 export interface LimitModalProps {
     title?: string;
     prompt?: React.ReactNode;
     okLabel?: string;
     formSheet?: boolean;
+    onOk: () => void;
 }
 
 export const LimitModalContent: React.FC<LimitModalProps> = ({
     title = 'Upgrade your plan',
     prompt,
     okLabel = 'Upgrade',
-    formSheet = false
+    formSheet = false,
+    onOk
 }) => {
-    const {updateRoute} = useRouting();
     return (
         <Modal
             backDropClick={false}
             formSheet={formSheet}
             okColor='green'
             okLabel={okLabel}
-            size={540}
             testId='limit-modal'
             title={title}
-            onOk={() => updateRoute({isExternal: true, route: 'pro'})}
+            width={540}
+            onOk={onOk}
         >
             <div className='py-4 leading-9'>
                 {prompt}
diff --git a/apps/admin-x-settings/src/admin-x-ds/global/modal/Modal.stories.tsx b/apps/admin-x-design-system/src/global/modal/Modal.stories.tsx
similarity index 86%
rename from apps/admin-x-settings/src/admin-x-ds/global/modal/Modal.stories.tsx
rename to apps/admin-x-design-system/src/global/modal/Modal.stories.tsx
index 2b2b33d4326..e5ea357cf7a 100644
--- a/apps/admin-x-settings/src/admin-x-ds/global/modal/Modal.stories.tsx
+++ b/apps/admin-x-design-system/src/global/modal/Modal.stories.tsx
@@ -1,10 +1,29 @@
-import {ReactNode} from 'react';
 import type {Meta, StoryContext, StoryObj} from '@storybook/react';
+import {ReactNode} from 'react';
 
-import Modal from './Modal';
-import ModalContainer from './ModalContainer';
-import ModalPage from './ModalPage';
 import NiceModal from '@ebay/nice-modal-react';
+import Button from '../Button';
+import Modal, {ModalProps} from './Modal';
+import ModalPage from './ModalPage';
+
+const ModalContainer: React.FC<ModalProps> = ({children, ...props}) => {
+    const modal = NiceModal.create<ModalProps>(() => {
+        return (
+            <Modal {...props}>
+                <div className='py-4'>
+                    {children}
+                </div>
+            </Modal>
+        );
+    });
+    return (
+        <div>
+            <Button color='black' label='Open modal' onClick={() => {
+                NiceModal.show(modal);
+            }} />
+        </div>
+    );
+};
 
 const meta = {
     title: 'Global / Modal',
@@ -114,6 +133,44 @@ export const Bleed: Story = {
     }
 };
 
+export const CustomWidth: Story = {
+    args: {
+        width: 600,
+        onOk: () => {
+            alert('Clicked OK!');
+        },
+        onCancel: undefined,
+        title: 'Custom width modal',
+        children: modalContent
+    }
+};
+
+export const CustomHeight: Story = {
+    args: {
+        size: 'md',
+        height: 'full',
+        onOk: () => {
+            alert('Clicked OK!');
+        },
+        onCancel: undefined,
+        title: 'Custom height modal',
+        children: modalContent
+    }
+};
+
+export const Square: Story = {
+    args: {
+        width: 320,
+        height: 320,
+        onOk: () => {
+            alert('Clicked OK!');
+        },
+        onCancel: undefined,
+        title: 'Square modal',
+        children: modalContent
+    }
+};
+
 export const CompletePage: Story = {
     args: {
         size: 'full',
@@ -212,4 +269,4 @@ export const FormSheet: Story = {
         formSheet: true,
         children: <p>Slightly differently styled modal that can be used to display small forms <em>inside other modals</em>. Use it sparingly!</p>
     }
-};
\ No newline at end of file
+};
diff --git a/apps/admin-x-settings/src/admin-x-ds/global/modal/Modal.tsx b/apps/admin-x-design-system/src/global/modal/Modal.tsx
similarity index 91%
rename from apps/admin-x-settings/src/admin-x-ds/global/modal/Modal.tsx
rename to apps/admin-x-design-system/src/global/modal/Modal.tsx
index aa20380db6d..952521fe96a 100644
--- a/apps/admin-x-settings/src/admin-x-ds/global/modal/Modal.tsx
+++ b/apps/admin-x-design-system/src/global/modal/Modal.tsx
@@ -1,14 +1,14 @@
+import {useModal} from '@ebay/nice-modal-react';
+import clsx from 'clsx';
+import React, {useEffect, useState} from 'react';
+import useGlobalDirtyState from '../../hooks/useGlobalDirtyState';
+import {confirmIfDirty} from '../../utils/modals';
 import Button, {ButtonColor, ButtonProps} from '../Button';
 import ButtonGroup from '../ButtonGroup';
 import Heading from '../Heading';
-import React, {useEffect, useState} from 'react';
 import StickyFooter from '../StickyFooter';
-import clsx from 'clsx';
-import useGlobalDirtyState from '../../../hooks/useGlobalDirtyState';
-import {confirmIfDirty} from '../../../utils/modals';
-import {useModal} from '@ebay/nice-modal-react';
 
-export type ModalSize = 'sm' | 'md' | 'lg' | 'xl' | 'full' | 'bleed' | number;
+export type ModalSize = 'sm' | 'md' | 'lg' | 'xl' | 'full' | 'bleed';
 
 export interface ModalProps {
 
@@ -16,7 +16,8 @@ export interface ModalProps {
      * Possible values are: `sm`, `md`, `lg`, `xl, `full`, `bleed`. Yu can also use any number to set an arbitrary width.
      */
     size?: ModalSize;
-    maxHeight?: number;
+    width?: 'full' | number;
+    height?: 'full' | number;
 
     testId?: string;
     title?: string;
@@ -50,7 +51,8 @@ export const topLevelBackdropClasses = 'bg-[rgba(98,109,121,0.2)] backdrop-blur-
 
 const Modal: React.FC<ModalProps> = ({
     size = 'md',
-    maxHeight,
+    width,
+    height,
     testId,
     title,
     okLabel = 'OK',
@@ -143,9 +145,9 @@ const Modal: React.FC<ModalProps> = ({
         }
     });
 
-    let buttons: ButtonProps[] = [];
+    const buttons: ButtonProps[] = [];
 
-    let footerClasses, contentClasses;
+    let contentClasses;
 
     const removeModal = () => {
         confirmIfDirty(dirty, () => {
@@ -336,14 +338,14 @@ const Modal: React.FC<ModalProps> = ({
         'max-[800px]:!pb-20'
     );
 
-    footerClasses = clsx(
+    const footerClasses = clsx(
         `${paddingClasses} ${stickyFooter ? 'py-6' : ''}`,
         'flex w-full items-center justify-between'
     );
 
     contentClasses = clsx(
         contentClasses,
-        ((size === 'full' || size === 'bleed') && 'grow')
+        ((size === 'full' || size === 'bleed' || height === 'full' || typeof height === 'number') && 'grow')
     );
 
     const handleBackdropClick = (e: React.MouseEvent<HTMLDivElement>) => {
@@ -352,14 +354,26 @@ const Modal: React.FC<ModalProps> = ({
         }
     };
 
-    let modalStyles:{maxWidth?: string; maxHeight?: string;} = {};
+    const modalStyles:{width?: string; height?: string; maxWidth?: string; maxHeight?: string;} = {};
 
-    if (typeof size === 'number') {
-        modalStyles.maxWidth = size + 'px';
+    if (typeof width === 'number') {
+        modalStyles.width = '100%';
+        modalStyles.maxWidth = width + 'px';
+    } else if (width === 'full') {
+        modalClasses = clsx(
+            modalClasses,
+            'w-full'
+        );
     }
 
-    if (maxHeight) {
-        modalStyles.maxHeight = maxHeight + 'px';
+    if (typeof height === 'number') {
+        modalStyles.height = '100%';
+        modalStyles.maxHeight = height + 'px';
+    } else if (height === 'full') {
+        modalClasses = clsx(
+            modalClasses,
+            'h-full'
+        );
     }
 
     let footerContent;
diff --git a/apps/admin-x-settings/src/admin-x-ds/global/modal/ModalPage.stories.tsx b/apps/admin-x-design-system/src/global/modal/ModalPage.stories.tsx
similarity index 100%
rename from apps/admin-x-settings/src/admin-x-ds/global/modal/ModalPage.stories.tsx
rename to apps/admin-x-design-system/src/global/modal/ModalPage.stories.tsx
diff --git a/apps/admin-x-settings/src/admin-x-ds/global/modal/ModalPage.tsx b/apps/admin-x-design-system/src/global/modal/ModalPage.tsx
similarity index 89%
rename from apps/admin-x-settings/src/admin-x-ds/global/modal/ModalPage.tsx
rename to apps/admin-x-design-system/src/global/modal/ModalPage.tsx
index 3fdbcecf568..84eda318bcd 100644
--- a/apps/admin-x-settings/src/admin-x-ds/global/modal/ModalPage.tsx
+++ b/apps/admin-x-design-system/src/global/modal/ModalPage.tsx
@@ -1,8 +1,8 @@
-import Heading from '../Heading';
-import React from 'react';
 import clsx from 'clsx';
+import React from 'react';
+import Heading from '../Heading';
 
-interface ModalPageProps {
+export interface ModalPageProps {
     heading?: string;
     children?: React.ReactNode;
     className?: string;
@@ -21,4 +21,4 @@ const ModalPage: React.FC<ModalPageProps> = ({heading, children, className}) =>
     );
 };
 
-export default ModalPage;
\ No newline at end of file
+export default ModalPage;
diff --git a/apps/admin-x-settings/src/admin-x-ds/global/modal/PreviewModal.stories.tsx b/apps/admin-x-design-system/src/global/modal/PreviewModal.stories.tsx
similarity index 87%
rename from apps/admin-x-settings/src/admin-x-ds/global/modal/PreviewModal.stories.tsx
rename to apps/admin-x-design-system/src/global/modal/PreviewModal.stories.tsx
index e4c2c8ada2d..5ba3a773a76 100644
--- a/apps/admin-x-settings/src/admin-x-ds/global/modal/PreviewModal.stories.tsx
+++ b/apps/admin-x-design-system/src/global/modal/PreviewModal.stories.tsx
@@ -1,11 +1,19 @@
-import {ReactNode} from 'react';
 import type {Meta, StoryContext, StoryObj} from '@storybook/react';
+import {ReactNode} from 'react';
 
-import Heading from '../Heading';
 import NiceModal from '@ebay/nice-modal-react';
-import PreviewModal from './PreviewModal';
-import PreviewModalContainer from './PreviewModalContainer';
+import Button from '../Button';
+import Heading from '../Heading';
 import {Tab} from '../TabView';
+import PreviewModal, {PreviewModalProps} from './PreviewModal';
+
+const PreviewModalContainer: React.FC<PreviewModalProps> = ({...props}) => {
+    return (
+        <Button color='black' label='Open preview modal' onClick={() => {
+            NiceModal.show(PreviewModal, {...props});
+        }} />
+    );
+};
 
 const meta = {
     title: 'Global / Modal / Preview Modal',
diff --git a/apps/admin-x-settings/src/admin-x-ds/global/modal/PreviewModal.tsx b/apps/admin-x-design-system/src/global/modal/PreviewModal.tsx
similarity index 96%
rename from apps/admin-x-settings/src/admin-x-ds/global/modal/PreviewModal.tsx
rename to apps/admin-x-design-system/src/global/modal/PreviewModal.tsx
index c1a5e1571cb..ec8dd1bff04 100644
--- a/apps/admin-x-settings/src/admin-x-ds/global/modal/PreviewModal.tsx
+++ b/apps/admin-x-design-system/src/global/modal/PreviewModal.tsx
@@ -1,23 +1,25 @@
+import NiceModal, {useModal} from '@ebay/nice-modal-react';
+import clsx from 'clsx';
+import React, {useEffect, useState} from 'react';
+import useGlobalDirtyState from '../../hooks/useGlobalDirtyState';
+import {confirmIfDirty} from '../../utils/modals';
+import {ButtonColor, ButtonProps} from '../Button';
 import ButtonGroup from '../ButtonGroup';
-import DesktopChrome from '../chrome/DesktopChrome';
 import Heading, {HeadingLevel} from '../Heading';
 import Icon from '../Icon';
+import TabView, {Tab} from '../TabView';
+import DesktopChrome from '../chrome/DesktopChrome';
 import MobileChrome from '../chrome/MobileChrome';
-import Modal, {ModalSize} from './Modal';
-import NiceModal, {useModal} from '@ebay/nice-modal-react';
-import React, {useEffect, useState} from 'react';
 import Select, {SelectOption} from '../form/Select';
-import TabView, {Tab} from '../TabView';
-import clsx from 'clsx';
-import useGlobalDirtyState from '../../../hooks/useGlobalDirtyState';
-import {ButtonColor, ButtonProps} from '../Button';
-import {confirmIfDirty} from '../../../utils/modals';
+import Modal, {ModalSize} from './Modal';
 
 export interface PreviewModalProps {
     testId?: string;
     title?: string;
     titleHeadingLevel?: HeadingLevel;
     size?: ModalSize;
+    width?: 'full' | number;
+    height?: 'full' | number;
     sidebar?: boolean | React.ReactNode;
     preview?: React.ReactNode;
     dirty?: boolean
@@ -54,6 +56,8 @@ export const PreviewModalContent: React.FC<PreviewModalProps> = ({
     title,
     titleHeadingLevel = 4,
     size = 'full',
+    width,
+    height,
     sidebar = '',
     preview,
     dirty = false,
@@ -215,7 +219,7 @@ export const PreviewModalContent: React.FC<PreviewModalProps> = ({
         );
     }
 
-    let buttons: ButtonProps[] = [];
+    const buttons: ButtonProps[] = [];
 
     if (!sidebarButtons) {
         buttons.push({
@@ -244,10 +248,12 @@ export const PreviewModalContent: React.FC<PreviewModalProps> = ({
             afterClose={afterClose}
             animate={false}
             footer={false}
+            height={height}
             padding={false}
             size={size}
             testId={testId}
             title=''
+            width={width}
             hideXOnMobile
         >
             <div className='flex h-full grow'>
diff --git a/apps/admin-x-settings/src/hooks/useGlobalDirtyState.tsx b/apps/admin-x-design-system/src/hooks/useGlobalDirtyState.tsx
similarity index 100%
rename from apps/admin-x-settings/src/hooks/useGlobalDirtyState.tsx
rename to apps/admin-x-design-system/src/hooks/useGlobalDirtyState.tsx
diff --git a/apps/admin-x-settings/src/hooks/usePagination.tsx b/apps/admin-x-design-system/src/hooks/usePagination.tsx
similarity index 60%
rename from apps/admin-x-settings/src/hooks/usePagination.tsx
rename to apps/admin-x-design-system/src/hooks/usePagination.tsx
index 675db0d979a..21c0a284ffd 100644
--- a/apps/admin-x-settings/src/hooks/usePagination.tsx
+++ b/apps/admin-x-design-system/src/hooks/usePagination.tsx
@@ -1,6 +1,13 @@
-import {Meta} from '../utils/api/hooks';
 import {useEffect, useState} from 'react';
 
+export interface PaginationMeta {
+    limit: number;
+    pages: number;
+    total: number;
+    next: number;
+    prev: number;
+}
+
 export interface PaginationData {
     page: number;
     pages: number | null;
@@ -16,17 +23,17 @@ export const usePage = () => {
     return {page, setPage};
 };
 
-export const usePagination = ({limit, meta, page, setPage}: {meta?: Meta, limit: number, page: number, setPage: React.Dispatch<React.SetStateAction<number>>}): PaginationData => {
+export const usePagination = ({limit, meta, page, setPage}: {meta?: PaginationMeta, limit: number, page: number, setPage: React.Dispatch<React.SetStateAction<number>>}): PaginationData => {
     // Prevent resetting meta when a new page loads
-    const [prevMeta, setPrevMeta] = useState<Meta | undefined>(meta);
+    const [prevMeta, setPrevMeta] = useState<PaginationMeta | undefined>(meta);
 
     useEffect(() => {
         if (meta) {
             setPrevMeta(meta);
 
-            if (meta.pagination.pages > 0 && meta.pagination.pages < page) {
+            if (meta.pages > 0 && meta.pages < page) {
                 // We probably deleted an item when on the last page: go one page back automatically
-                setPage(meta.pagination.pages);
+                setPage(meta.pages);
             }
         }
     }, [meta, setPage, page]);
@@ -34,10 +41,10 @@ export const usePagination = ({limit, meta, page, setPage}: {meta?: Meta, limit:
     return {
         page,
         setPage,
-        pages: prevMeta?.pagination.pages ?? null,
-        limit: prevMeta?.pagination.limit ?? limit,
-        total: prevMeta?.pagination.total ?? null,
-        nextPage: () => setPage(Math.min(page + 1, prevMeta?.pagination.pages ? prevMeta.pagination.pages : page)),
+        pages: prevMeta?.pages ?? null,
+        limit: prevMeta?.limit ?? limit,
+        total: prevMeta?.total ?? null,
+        nextPage: () => setPage(Math.min(page + 1, prevMeta?.pages ? prevMeta.pages : page)),
         prevPage: () => setPage(Math.max(1, page - 1))
     };
 };
diff --git a/apps/admin-x-design-system/src/index.ts b/apps/admin-x-design-system/src/index.ts
new file mode 100644
index 00000000000..fab19ffc54b
--- /dev/null
+++ b/apps/admin-x-design-system/src/index.ts
@@ -0,0 +1,159 @@
+export {ReactComponent as FacebookLogo} from './assets/images/facebook-logo.svg';
+export {ReactComponent as GhostLogo} from './assets/images/ghost-logo.svg';
+export {ReactComponent as GhostOrb} from './assets/images/ghost-orb.svg';
+export {ReactComponent as GoogleLogo} from './assets/images/google-logo.svg';
+export {ReactComponent as TwitterLogo} from './assets/images/twitter-logo.svg';
+export {ReactComponent as XLogo} from './assets/images/x-logo.svg';
+
+export {default as DesktopChrome} from './global/chrome/DesktopChrome';
+export type {DesktopChromeProps} from './global/chrome/DesktopChrome';
+export {default as DesktopChromeHeader} from './global/chrome/DesktopChromeHeader';
+export type {DesktopChromeHeaderProps} from './global/chrome/DesktopChromeHeader';
+export {default as MobileChrome} from './global/chrome/MobileChrome';
+export type {MobileChromeProps} from './global/chrome/MobileChrome';
+
+export {default as Checkbox} from './global/form/Checkbox';
+export type {CheckboxProps} from './global/form/Checkbox';
+export {default as CheckboxGroup} from './global/form/CheckboxGroup';
+export type {CheckboxGroupProps} from './global/form/CheckboxGroup';
+export {default as CodeEditor} from './global/form/CodeEditor';
+export type {CodeEditorProps} from './global/form/CodeEditor';
+export {default as ColorIndicator} from './global/form/ColorIndicator';
+export type {ColorIndicatorProps} from './global/form/ColorIndicator';
+export {default as ColorPicker} from './global/form/ColorPicker';
+export type {ColorPickerProps} from './global/form/ColorPicker';
+export {default as ColorPickerField} from './global/form/ColorPickerField';
+export type {ColorPickerFieldProps} from './global/form/ColorPickerField';
+export {default as CurrencyField} from './global/form/CurrencyField';
+export type {CurrencyFieldProps} from './global/form/CurrencyField';
+export {default as FileUpload} from './global/form/FileUpload';
+export type {FileUploadProps} from './global/form/FileUpload';
+export {default as Form} from './global/form/Form';
+export type {FormProps} from './global/form/Form';
+export {default as HtmlEditor} from './global/form/HtmlEditor';
+export type {HtmlEditorProps} from './global/form/HtmlEditor';
+export {default as HtmlField} from './global/form/HtmlField';
+export type {HtmlFieldProps} from './global/form/HtmlField';
+export {default as ImageUpload} from './global/form/ImageUpload';
+export type {ImageUploadProps} from './global/form/ImageUpload';
+export {default as MultiSelect} from './global/form/MultiSelect';
+export type {LoadMultiSelectOptions, MultiSelectOption, MultiSelectProps} from './global/form/MultiSelect';
+export {default as Radio} from './global/form/Radio';
+export type {RadioProps} from './global/form/Radio';
+export {default as Select} from './global/form/Select';
+export type {LoadSelectOptions, SelectOption, SelectOptionGroup, SelectProps} from './global/form/Select';
+export {default as TextArea} from './global/form/TextArea';
+export type {TextAreaProps} from './global/form/TextArea';
+export {default as TextField} from './global/form/TextField';
+export type {TextFieldProps} from './global/form/TextField';
+export {default as Toggle} from './global/form/Toggle';
+export type {ToggleProps} from './global/form/Toggle';
+export {default as ToggleGroup} from './global/form/ToggleGroup';
+export type {ToggleGroupProps} from './global/form/ToggleGroup';
+export {default as URLTextField, formatUrl} from './global/form/URLTextField';
+export type {URLTextFieldProps} from './global/form/URLTextField';
+
+export {default as ConfirmationModal, ConfirmationModalContent} from './global/modal/ConfirmationModal';
+export type {ConfirmationModalProps} from './global/modal/ConfirmationModal';
+export {default as LimitModal, LimitModalContent} from './global/modal/LimitModal';
+export type {LimitModalProps} from './global/modal/LimitModal';
+export {default as Modal, topLevelBackdropClasses} from './global/modal/Modal';
+export type {ModalProps} from './global/modal/Modal';
+export {default as ModalPage} from './global/modal/ModalPage';
+export type {ModalPageProps} from './global/modal/ModalPage';
+export {default as PreviewModal, PreviewModalContent} from './global/modal/PreviewModal';
+export type {PreviewModalProps} from './global/modal/PreviewModal';
+
+export {default as Avatar} from './global/Avatar';
+export type {AvatarProps} from './global/Avatar';
+export {default as Banner} from './global/Banner';
+export type {BannerProps} from './global/Banner';
+export {default as Breadcrumbs} from './global/Breadcrumbs';
+export type {BreadcrumbItem, BreadcrumbsProps} from './global/Breadcrumbs';
+export {default as Button} from './global/Button';
+export type {ButtonColor, ButtonProps} from './global/Button';
+export {default as ButtonGroup} from './global/ButtonGroup';
+export type {ButtonGroupProps} from './global/ButtonGroup';
+export {default as ErrorBoundary, withErrorBoundary} from './global/ErrorBoundary';
+export type {ErrorBoundaryProps} from './global/ErrorBoundary';
+export {default as Heading} from './global/Heading';
+export type {HeadingProps} from './global/Heading';
+export {default as Hint} from './global/Hint';
+export type {HintProps} from './global/Hint';
+export {default as Icon} from './global/Icon';
+export type {IconProps} from './global/Icon';
+export {default as IconLabel} from './global/IconLabel';
+export type {IconLabelProps} from './global/IconLabel';
+export {default as InfiniteScrollListener} from './global/InfiniteScrollListener';
+export type {InfiniteScrollListenerProps} from './global/InfiniteScrollListener';
+export {default as Link} from './global/Link';
+export type {LinkProps} from './global/Link';
+export {default as List} from './global/List';
+export type {ListProps} from './global/List';
+export {default as ListHeading} from './global/ListHeading';
+export type {ListHeadingProps} from './global/ListHeading';
+export {default as ListItem} from './global/ListItem';
+export type {ListItemProps} from './global/ListItem';
+export {LoadingIndicator} from './global/LoadingIndicator';
+export type {LoadingIndicatorProps} from './global/LoadingIndicator';
+export {default as Menu} from './global/Menu';
+export type {MenuItem, MenuProps} from './global/Menu';
+export {default as NoValueLabel} from './global/NoValueLabel';
+export type {NoValueLabelProps} from './global/NoValueLabel';
+export {default as Pagination} from './global/Pagination';
+export type {PaginationProps} from './global/Pagination';
+export {default as Popover} from './global/Popover';
+export type {PopoverProps} from './global/Popover';
+export {default as Separator} from './global/Separator';
+export type {SeparatorProps} from './global/Separator';
+export {default as SortableList} from './global/SortableList';
+export type {SortableListProps} from './global/SortableList';
+export {default as StickyFooter} from './global/StickyFooter';
+export type {StickyFooterProps} from './global/StickyFooter';
+export {default as TabView} from './global/TabView';
+export type {Tab, TabViewProps} from './global/TabView';
+export {default as Table} from './global/Table';
+export type {ShowMoreData, TableProps} from './global/Table';
+export {default as TableCell} from './global/TableCell';
+export type {TableCellProps} from './global/TableCell';
+export {default as TableHead} from './global/TableHead';
+export type {TableHeadProps} from './global/TableHead';
+export {default as TableRow} from './global/TableRow';
+export type {TableRowProps} from './global/TableRow';
+export {default as Toast, dismissAllToasts, showToast} from './global/Toast';
+export type {ToastProps} from './global/Toast';
+export {default as Tooltip} from './global/Tooltip';
+export type {TooltipProps} from './global/Tooltip';
+export {default as PageHeader} from './global/layout/PageHeader';
+export type {PageHeaderProps} from './global/layout/PageHeader';
+
+export {default as SettingGroup} from './settings/SettingGroup';
+export type {SettingGroupProps} from './settings/SettingGroup';
+export {default as SettingGroupContent} from './settings/SettingGroupContent';
+export type {SettingGroupContentProps} from './settings/SettingGroupContent';
+export {default as SettingGroupHeader} from './settings/SettingGroupHeader';
+export type {SettingGroupHeaderProps} from './settings/SettingGroupHeader';
+export {default as SettingNavItem} from './settings/SettingNavItem';
+export type {SettingNavItemProps} from './settings/SettingNavItem';
+export {default as SettingNavSection} from './settings/SettingNavSection';
+export type {SettingNavSectionProps} from './settings/SettingNavSection';
+export {default as SettingSection} from './settings/SettingSection';
+export type {SettingSectionProps} from './settings/SettingSection';
+export {default as SettingSectionHeader} from './settings/SettingSectionHeader';
+export type {SettingSectionHeaderProps} from './settings/SettingSectionHeader';
+export {default as SettingValue} from './settings/SettingValue';
+export type {SettingValueProps} from './settings/SettingValue';
+export {default as StripeButton} from './settings/StripeButton';
+export type {StripeButtonProps} from './settings/StripeButton';
+
+export {default as useGlobalDirtyState} from './hooks/useGlobalDirtyState';
+export {usePagination} from './hooks/usePagination';
+export type {PaginationData} from './hooks/usePagination';
+
+export {debounce} from './utils/debounce';
+export {confirmIfDirty} from './utils/modals';
+
+export {default as DesignSystemApp} from './DesignSystemApp';
+export type {DesignSystemAppProps} from './DesignSystemApp';
+export {useFocusContext} from './providers/DesignSystemProvider';
+
diff --git a/apps/admin-x-settings/src/admin-x-ds/providers/DesignSystemProvider.tsx b/apps/admin-x-design-system/src/providers/DesignSystemProvider.tsx
similarity index 52%
rename from apps/admin-x-settings/src/admin-x-ds/providers/DesignSystemProvider.tsx
rename to apps/admin-x-design-system/src/providers/DesignSystemProvider.tsx
index 9f095408f0c..c655165d9cf 100644
--- a/apps/admin-x-settings/src/admin-x-ds/providers/DesignSystemProvider.tsx
+++ b/apps/admin-x-design-system/src/providers/DesignSystemProvider.tsx
@@ -1,15 +1,26 @@
 // FocusContext.tsx
+import NiceModal from '@ebay/nice-modal-react';
 import React, {createContext, useContext, useState} from 'react';
+import {Toaster} from 'react-hot-toast';
+import {FetchKoenigLexical} from '../global/form/HtmlEditor';
+import {GlobalDirtyStateProvider} from '../hooks/useGlobalDirtyState';
 
 interface DesignSystemContextType {
     isAnyTextFieldFocused: boolean;
     setFocusState: (value: boolean) => void;
+    fetchKoenigLexical: FetchKoenigLexical;
 }
 
-const DesignSystemContext = createContext<DesignSystemContextType | undefined>(undefined);
+const DesignSystemContext = createContext<DesignSystemContextType>({
+    isAnyTextFieldFocused: false,
+    setFocusState: () => {},
+    fetchKoenigLexical: async () => {}
+});
+
+export const useDesignSystem = () => useContext(DesignSystemContext);
 
 export const useFocusContext = () => {
-    const context = useContext(DesignSystemContext);
+    const context = useDesignSystem();
     if (!context) {
         throw new Error('useFocusContext must be used within a FocusProvider');
     }
@@ -17,10 +28,11 @@ export const useFocusContext = () => {
 };
 
 interface DesignSystemProviderProps {
+    fetchKoenigLexical: FetchKoenigLexical;
     children: React.ReactNode;
 }
 
-const DesignSystemProvider: React.FC<DesignSystemProviderProps> = ({children}) => {
+const DesignSystemProvider: React.FC<DesignSystemProviderProps> = ({fetchKoenigLexical, children}) => {
     const [isAnyTextFieldFocused, setIsAnyTextFieldFocused] = useState(false);
 
     const setFocusState = (value: boolean) => {
@@ -28,8 +40,13 @@ const DesignSystemProvider: React.FC<DesignSystemProviderProps> = ({children}) =
     };
 
     return (
-        <DesignSystemContext.Provider value={{isAnyTextFieldFocused, setFocusState}}>
-            {children}
+        <DesignSystemContext.Provider value={{isAnyTextFieldFocused, setFocusState, fetchKoenigLexical}}>
+            <GlobalDirtyStateProvider>
+                <Toaster />
+                <NiceModal.Provider>
+                    {children}
+                </NiceModal.Provider>
+            </GlobalDirtyStateProvider>
         </DesignSystemContext.Provider>
     );
 };
diff --git a/apps/admin-x-settings/src/admin-x-ds/settings/SettingGroup.stories.tsx b/apps/admin-x-design-system/src/settings/SettingGroup.stories.tsx
similarity index 100%
rename from apps/admin-x-settings/src/admin-x-ds/settings/SettingGroup.stories.tsx
rename to apps/admin-x-design-system/src/settings/SettingGroup.stories.tsx
diff --git a/apps/admin-x-settings/src/admin-x-ds/settings/SettingGroup.tsx b/apps/admin-x-design-system/src/settings/SettingGroup.tsx
similarity index 80%
rename from apps/admin-x-settings/src/admin-x-ds/settings/SettingGroup.tsx
rename to apps/admin-x-design-system/src/settings/SettingGroup.tsx
index 36cf3a03a16..cd37980e8b9 100644
--- a/apps/admin-x-settings/src/admin-x-ds/settings/SettingGroup.tsx
+++ b/apps/admin-x-design-system/src/settings/SettingGroup.tsx
@@ -1,27 +1,24 @@
-import ButtonGroup from '../global/ButtonGroup';
-import React, {useEffect, useState} from 'react';
-import SettingGroupHeader from './SettingGroupHeader';
 import clsx from 'clsx';
-import useRouting from '../../hooks/useRouting';
+import React, {forwardRef, useEffect} from 'react';
 import {ButtonProps} from '../global/Button';
-import {SaveState} from '../../hooks/useForm';
-import {useScrollSection} from '../../hooks/useScrollSection';
-import {useSearch} from '../../components/providers/ServiceProvider';
+import ButtonGroup from '../global/ButtonGroup';
+import SettingGroupHeader from './SettingGroupHeader';
 
-interface SettingGroupProps {
+export interface SettingGroupProps {
     navid?:string;
     testId?: string;
     title?: string;
     description?: React.ReactNode;
-    keywords?: string[];
+    isVisible?: boolean;
     isEditing?: boolean;
-    saveState?: SaveState;
+    saveState?: 'unsaved' | 'saved' | 'saving' | string;
     customHeader?: React.ReactNode;
     customButtons?: React.ReactNode;
     beta?: boolean;
     children?: React.ReactNode;
     hideEditButton?: boolean;
     alwaysShowSaveButton?: boolean;
+    highlight?: boolean;
 
     /**
      * Show a green outline in case the modal that's been triggered from the group is closed
@@ -43,12 +40,12 @@ interface SettingGroupProps {
     enableCMDS?: boolean
 }
 
-const SettingGroup: React.FC<SettingGroupProps> = ({
+const SettingGroup = forwardRef<HTMLDivElement, SettingGroupProps>(function SettingGroup({
     navid,
     testId,
     title,
     description,
-    keywords = [],
+    isVisible = true,
     isEditing,
     saveState,
     customHeader,
@@ -58,18 +55,14 @@ const SettingGroup: React.FC<SettingGroupProps> = ({
     hideEditButton,
     alwaysShowSaveButton = true,
     border = true,
+    highlight = false,
     highlightOnModalClose = true,
     styles,
     onEditingChange,
     onSave,
     onCancel,
     enableCMDS = true
-}) => {
-    const {checkVisible} = useSearch();
-    const {route} = useRouting();
-    const [highlight, setHighlight] = useState(false);
-    const {ref} = useScrollSection(navid);
-
+}, ref) {
     const handleEdit = () => {
         onEditingChange?.(true);
     };
@@ -91,7 +84,7 @@ const SettingGroup: React.FC<SettingGroupProps> = ({
         styles += ' border-grey-300 dark:border-grey-800 hover:border-grey-500';
     }
 
-    let viewButtons: ButtonProps[] = [];
+    const viewButtons: ButtonProps[] = [];
 
     if (!hideEditButton) {
         let label = 'Edit';
@@ -117,7 +110,7 @@ const SettingGroup: React.FC<SettingGroupProps> = ({
         );
     }
 
-    let editButtons: ButtonProps[] = [
+    const editButtons: ButtonProps[] = [
         {
             label: 'Cancel',
             key: 'cancel',
@@ -140,18 +133,6 @@ const SettingGroup: React.FC<SettingGroupProps> = ({
         );
     }
 
-    useEffect(() => {
-        setHighlight(route === navid);
-    }, [route, navid]);
-
-    useEffect(() => {
-        if (highlight) {
-            setTimeout(() => {
-                setHighlight(false);
-            }, 3000);
-        }
-    }, [highlight]);
-
     useEffect(() => {
         const handleCMDS = (e: KeyboardEvent) => {
             if ((e.metaKey || e.ctrlKey) && e.key === 's') {
@@ -170,7 +151,7 @@ const SettingGroup: React.FC<SettingGroupProps> = ({
     const containerClasses = clsx(
         'relative flex-col gap-6 rounded-lg transition-all',
         border && 'border p-5 md:p-7',
-        !checkVisible(keywords) ? 'hidden' : 'flex',
+        isVisible ? 'flex' : 'hidden',
         (highlight && highlightOnModalClose) && 'before:pointer-events-none before:absolute before:inset-[1px] before:animate-setting-highlight-fade-out before:rounded before:shadow-[0_0_0_3px_rgba(48,207,67,0.45)]',
         !isEditing && 'is-not-editing group/setting-group',
         styles
@@ -188,6 +169,6 @@ const SettingGroup: React.FC<SettingGroupProps> = ({
             {children}
         </div>
     );
-};
+});
 
 export default SettingGroup;
diff --git a/apps/admin-x-settings/src/admin-x-ds/settings/SettingGroupContent.stories.tsx b/apps/admin-x-design-system/src/settings/SettingGroupContent.stories.tsx
similarity index 100%
rename from apps/admin-x-settings/src/admin-x-ds/settings/SettingGroupContent.stories.tsx
rename to apps/admin-x-design-system/src/settings/SettingGroupContent.stories.tsx
diff --git a/apps/admin-x-settings/src/admin-x-ds/settings/SettingGroupContent.tsx b/apps/admin-x-design-system/src/settings/SettingGroupContent.tsx
similarity index 71%
rename from apps/admin-x-settings/src/admin-x-ds/settings/SettingGroupContent.tsx
rename to apps/admin-x-design-system/src/settings/SettingGroupContent.tsx
index 62798901b69..f2efcf61e76 100644
--- a/apps/admin-x-settings/src/admin-x-ds/settings/SettingGroupContent.tsx
+++ b/apps/admin-x-design-system/src/settings/SettingGroupContent.tsx
@@ -1,9 +1,8 @@
 import React from 'react';
 
-import SettingValue from './SettingValue';
-import {SettingValueProps} from './SettingValue';
+import SettingValue, {SettingValueProps} from './SettingValue';
 
-interface ISettingGroupContent {
+export interface SettingGroupContentProps {
     columns?: 1 | 2;
 
     /**
@@ -14,7 +13,7 @@ interface ISettingGroupContent {
     className?: string;
 }
 
-const SettingGroupContent: React.FC<ISettingGroupContent> = ({columns, values, children, className}) => {
+const SettingGroupContent: React.FC<SettingGroupContentProps> = ({columns, values, children, className}) => {
     let styles = 'flex flex-col gap-x-5 gap-y-7';
     if (columns === 2) {
         styles = 'grid grid-cols-1 md:grid-cols-2 gap-x-8 gap-y-6';
@@ -32,4 +31,4 @@ const SettingGroupContent: React.FC<ISettingGroupContent> = ({columns, values, c
     );
 };
 
-export default SettingGroupContent;
\ No newline at end of file
+export default SettingGroupContent;
diff --git a/apps/admin-x-settings/src/admin-x-ds/settings/SettingGroupHeader.stories.tsx b/apps/admin-x-design-system/src/settings/SettingGroupHeader.stories.tsx
similarity index 100%
rename from apps/admin-x-settings/src/admin-x-ds/settings/SettingGroupHeader.stories.tsx
rename to apps/admin-x-design-system/src/settings/SettingGroupHeader.stories.tsx
diff --git a/apps/admin-x-settings/src/admin-x-ds/settings/SettingGroupHeader.tsx b/apps/admin-x-design-system/src/settings/SettingGroupHeader.tsx
similarity index 53%
rename from apps/admin-x-settings/src/admin-x-ds/settings/SettingGroupHeader.tsx
rename to apps/admin-x-design-system/src/settings/SettingGroupHeader.tsx
index c40aba80577..181196bcf37 100644
--- a/apps/admin-x-settings/src/admin-x-ds/settings/SettingGroupHeader.tsx
+++ b/apps/admin-x-design-system/src/settings/SettingGroupHeader.tsx
@@ -1,23 +1,20 @@
-import Heading from '../global/Heading';
 import React from 'react';
-import {useSearch} from '../../components/providers/ServiceProvider';
+import Heading from '../global/Heading';
 
-interface Props {
-    title?: string;
+export interface SettingGroupHeaderProps {
+    title?: React.ReactNode;
     description?: React.ReactNode;
     beta?: boolean;
     children?: React.ReactNode;
 }
 
-const SettingGroupHeader: React.FC<Props> = ({title, description, children, beta = false}) => {
-    const {highlightKeywords} = useSearch();
-
+const SettingGroupHeader: React.FC<SettingGroupHeaderProps> = ({title, description, children, beta = false}) => {
     return (
         <div className="flex items-start justify-between gap-4">
             {(title || description) &&
                 <div>
-                    <Heading level={5}>{highlightKeywords(title || '')}{beta && <sup className='ml-0.5 text-[10px] font-semibold uppercase tracking-wide'>Beta</sup>}</Heading>
-                    {description && <p className="mt-1 hidden max-w-lg group-[.is-not-editing]/setting-group:!visible group-[.is-not-editing]/setting-group:!block md:!visible md:!block">{highlightKeywords(description)}</p>}
+                    <Heading level={5}>{title}{beta && <sup className='ml-0.5 text-[10px] font-semibold uppercase tracking-wide'>Beta</sup>}</Heading>
+                    {description && <p className="mt-1 hidden max-w-lg group-[.is-not-editing]/setting-group:!visible group-[.is-not-editing]/setting-group:!block md:!visible md:!block">{description}</p>}
                 </div>
             }
             <div className='-mt-0.5'>
diff --git a/apps/admin-x-settings/src/admin-x-ds/settings/SettingNavItem.stories.tsx b/apps/admin-x-design-system/src/settings/SettingNavItem.stories.tsx
similarity index 100%
rename from apps/admin-x-settings/src/admin-x-ds/settings/SettingNavItem.stories.tsx
rename to apps/admin-x-design-system/src/settings/SettingNavItem.stories.tsx
diff --git a/apps/admin-x-settings/src/admin-x-ds/settings/SettingNavItem.tsx b/apps/admin-x-design-system/src/settings/SettingNavItem.tsx
similarity index 50%
rename from apps/admin-x-settings/src/admin-x-ds/settings/SettingNavItem.tsx
rename to apps/admin-x-design-system/src/settings/SettingNavItem.tsx
index dbae0c02fc8..be1d17d57fa 100644
--- a/apps/admin-x-settings/src/admin-x-ds/settings/SettingNavItem.tsx
+++ b/apps/admin-x-design-system/src/settings/SettingNavItem.tsx
@@ -1,32 +1,29 @@
-import Icon from '../global/Icon';
-import React from 'react';
 import clsx from 'clsx';
-import {useScrollSectionContext, useScrollSectionNav} from '../../hooks/useScrollSection';
-import {useSearch} from '../../components/providers/ServiceProvider';
+import React, {forwardRef} from 'react';
+import Icon from '../global/Icon';
 
-interface Props {
+export interface SettingNavItemProps extends Omit<React.HTMLProps<HTMLLIElement>, 'ref' | 'title' | 'onClick'> {
     title: React.ReactNode;
     navid?: string;
     icon?: string;
-    keywords?: string[];
-    onClick?: (e:React.MouseEvent<HTMLAnchorElement>) => void;
+    isCurrent?: boolean;
+    isVisible?: boolean;
+    onClick?: (e: React.MouseEvent<HTMLAnchorElement>) => void;
 }
 
-const SettingNavItem: React.FC<Props> = ({
+const SettingNavItem = forwardRef<HTMLLIElement, SettingNavItemProps>(function SettingNavItem({
     title,
     navid = '',
     icon,
-    keywords,
-    onClick
-}) => {
-    const {ref, props} = useScrollSectionNav(navid);
-    const {currentSection} = useScrollSectionContext();
-    const {checkVisible} = useSearch();
-
+    isCurrent = false,
+    isVisible = true,
+    onClick = () => {},
+    ...props
+}, ref) {
     const classNames = clsx(
         'w-100 flex h-8 cursor-pointer items-center rounded-md px-2 py-1 text-left text-sm transition-all hover:bg-grey-100 focus:bg-grey-100 dark:text-grey-300 dark:hover:bg-grey-925 dark:focus:bg-grey-900',
-        (currentSection === navid) && 'bg-grey-200 dark:bg-grey-900',
-        !checkVisible(keywords || []) && 'hidden'
+        isCurrent && 'bg-grey-200 dark:bg-grey-900',
+        !isVisible && 'hidden'
     );
 
     return (
@@ -35,6 +32,6 @@ const SettingNavItem: React.FC<Props> = ({
             {title}
         </a></li>
     );
-};
+});
 
 export default SettingNavItem;
diff --git a/apps/admin-x-settings/src/admin-x-ds/settings/SettingNavSection.stories.tsx b/apps/admin-x-design-system/src/settings/SettingNavSection.stories.tsx
similarity index 100%
rename from apps/admin-x-settings/src/admin-x-ds/settings/SettingNavSection.stories.tsx
rename to apps/admin-x-design-system/src/settings/SettingNavSection.stories.tsx
diff --git a/apps/admin-x-settings/src/admin-x-ds/settings/SettingNavSection.tsx b/apps/admin-x-design-system/src/settings/SettingNavSection.tsx
similarity index 60%
rename from apps/admin-x-settings/src/admin-x-ds/settings/SettingNavSection.tsx
rename to apps/admin-x-design-system/src/settings/SettingNavSection.tsx
index 39c9195fb39..592355575d6 100644
--- a/apps/admin-x-settings/src/admin-x-ds/settings/SettingNavSection.tsx
+++ b/apps/admin-x-design-system/src/settings/SettingNavSection.tsx
@@ -1,16 +1,13 @@
 import React from 'react';
-import {useSearch} from '../../components/providers/ServiceProvider';
 
-interface Props {
+export interface SettingNavSectionProps {
     title?: string;
-    keywords?: string[];
+    isVisible?: boolean;
     children?: React.ReactNode;
 }
 
-const SettingNavSection: React.FC<Props> = ({title, keywords, children}) => {
-    const {checkVisible} = useSearch();
-
-    if (!checkVisible(keywords || [])) {
+const SettingNavSection: React.FC<SettingNavSectionProps> = ({title, isVisible, children}) => {
+    if (!isVisible) {
         return null;
     }
 
diff --git a/apps/admin-x-settings/src/admin-x-ds/settings/SettingSection.stories.tsx b/apps/admin-x-design-system/src/settings/SettingSection.stories.tsx
similarity index 100%
rename from apps/admin-x-settings/src/admin-x-ds/settings/SettingSection.stories.tsx
rename to apps/admin-x-design-system/src/settings/SettingSection.stories.tsx
diff --git a/apps/admin-x-settings/src/admin-x-ds/settings/SettingSection.tsx b/apps/admin-x-design-system/src/settings/SettingSection.tsx
similarity index 67%
rename from apps/admin-x-settings/src/admin-x-ds/settings/SettingSection.tsx
rename to apps/admin-x-design-system/src/settings/SettingSection.tsx
index fce4585666b..c104af3a784 100644
--- a/apps/admin-x-settings/src/admin-x-ds/settings/SettingSection.tsx
+++ b/apps/admin-x-design-system/src/settings/SettingSection.tsx
@@ -1,20 +1,17 @@
+import clsx from 'clsx';
 import React from 'react';
 import SettingSectionHeader from './SettingSectionHeader';
-import clsx from 'clsx';
-import {useSearch} from '../../components/providers/ServiceProvider';
 
-interface Props {
+export interface SettingSectionProps {
     title?: string;
-    keywords?: string[];
+    isVisible?: boolean;
     children?: React.ReactNode;
 }
 
-const SettingSection: React.FC<Props> = ({title, keywords = [], children}) => {
-    const {checkVisible} = useSearch();
-
+const SettingSection: React.FC<SettingSectionProps> = ({title, isVisible = true, children}) => {
     const containerClassNames = clsx(
         'mb-[16vh]',
-        checkVisible(keywords) ? '' : 'hidden'
+        isVisible ? '' : 'hidden'
     );
 
     return (
diff --git a/apps/admin-x-settings/src/admin-x-ds/settings/SettingSectionHeader.stories.tsx b/apps/admin-x-design-system/src/settings/SettingSectionHeader.stories.tsx
similarity index 100%
rename from apps/admin-x-settings/src/admin-x-ds/settings/SettingSectionHeader.stories.tsx
rename to apps/admin-x-design-system/src/settings/SettingSectionHeader.stories.tsx
diff --git a/apps/admin-x-settings/src/admin-x-ds/settings/SettingSectionHeader.tsx b/apps/admin-x-design-system/src/settings/SettingSectionHeader.tsx
similarity index 70%
rename from apps/admin-x-settings/src/admin-x-ds/settings/SettingSectionHeader.tsx
rename to apps/admin-x-design-system/src/settings/SettingSectionHeader.tsx
index bc89701b991..8f7a51d90fe 100644
--- a/apps/admin-x-settings/src/admin-x-ds/settings/SettingSectionHeader.tsx
+++ b/apps/admin-x-design-system/src/settings/SettingSectionHeader.tsx
@@ -1,12 +1,12 @@
-import React from 'react';
 import clsx from 'clsx';
+import React from 'react';
 
-interface Props {
+export interface SettingSectionHeaderProps {
     title: string;
     sticky?: boolean;
 }
 
-const SettingSectionHeader: React.FC<Props> = ({title, sticky = false}) => {
+const SettingSectionHeader: React.FC<SettingSectionHeaderProps> = ({title, sticky = false}) => {
     const classNames = clsx(
         'z-20 mb-px pb-10 text-4xl font-bold tracking-tighter',
         (sticky ? 'sticky top-0 mt-[calc(-8vmin-4px)] bg-gradient-to-t from-transparent via-white via-20% to-white pt-[calc(8vmin-4px)] dark:bg-black' : 'mt-[-5px]')
@@ -17,4 +17,4 @@ const SettingSectionHeader: React.FC<Props> = ({title, sticky = false}) => {
     );
 };
 
-export default SettingSectionHeader;
\ No newline at end of file
+export default SettingSectionHeader;
diff --git a/apps/admin-x-settings/src/admin-x-ds/settings/SettingValue.stories.tsx b/apps/admin-x-design-system/src/settings/SettingValue.stories.tsx
similarity index 100%
rename from apps/admin-x-settings/src/admin-x-ds/settings/SettingValue.stories.tsx
rename to apps/admin-x-design-system/src/settings/SettingValue.stories.tsx
diff --git a/apps/admin-x-settings/src/admin-x-ds/settings/SettingValue.tsx b/apps/admin-x-design-system/src/settings/SettingValue.tsx
similarity index 100%
rename from apps/admin-x-settings/src/admin-x-ds/settings/SettingValue.tsx
rename to apps/admin-x-design-system/src/settings/SettingValue.tsx
diff --git a/apps/admin-x-settings/src/admin-x-ds/settings/StripeButton.stories.tsx b/apps/admin-x-design-system/src/settings/StripeButton.stories.tsx
similarity index 100%
rename from apps/admin-x-settings/src/admin-x-ds/settings/StripeButton.stories.tsx
rename to apps/admin-x-design-system/src/settings/StripeButton.stories.tsx
diff --git a/apps/admin-x-settings/src/admin-x-ds/settings/StripeButton.tsx b/apps/admin-x-design-system/src/settings/StripeButton.tsx
similarity index 98%
rename from apps/admin-x-settings/src/admin-x-ds/settings/StripeButton.tsx
rename to apps/admin-x-design-system/src/settings/StripeButton.tsx
index dbeec9acf26..57e21415609 100644
--- a/apps/admin-x-settings/src/admin-x-ds/settings/StripeButton.tsx
+++ b/apps/admin-x-design-system/src/settings/StripeButton.tsx
@@ -1,8 +1,8 @@
-import Button, {ButtonProps} from '../global/Button';
-import React from 'react';
 import clsx from 'clsx';
+import React from 'react';
+import Button, {ButtonProps} from '../global/Button';
 
-interface StripeButtonProps {
+export interface StripeButtonProps {
     label?: React.ReactNode;
     className?: string;
 }
diff --git a/apps/admin-x-design-system/src/typings.d.ts b/apps/admin-x-design-system/src/typings.d.ts
new file mode 100644
index 00000000000..dd3eff0ee75
--- /dev/null
+++ b/apps/admin-x-design-system/src/typings.d.ts
@@ -0,0 +1,6 @@
+declare module '*.svg' {
+    import React = require('react');
+    export const ReactComponent: React.FC<React.SVGProps<SVGSVGElement>>;
+    const src: string;
+    export default src;
+}
diff --git a/apps/admin-x-settings/src/utils/debounce.ts b/apps/admin-x-design-system/src/utils/debounce.ts
similarity index 100%
rename from apps/admin-x-settings/src/utils/debounce.ts
rename to apps/admin-x-design-system/src/utils/debounce.ts
diff --git a/apps/admin-x-settings/src/utils/modals.tsx b/apps/admin-x-design-system/src/utils/modals.tsx
similarity index 88%
rename from apps/admin-x-settings/src/utils/modals.tsx
rename to apps/admin-x-design-system/src/utils/modals.tsx
index fe904faf220..8a37e8522ce 100644
--- a/apps/admin-x-settings/src/utils/modals.tsx
+++ b/apps/admin-x-design-system/src/utils/modals.tsx
@@ -1,5 +1,5 @@
-import ConfirmationModal, {ConfirmationModalProps} from '../admin-x-ds/global/modal/ConfirmationModal';
 import NiceModal from '@ebay/nice-modal-react';
+import ConfirmationModal, {ConfirmationModalProps} from '../global/modal/ConfirmationModal';
 
 export function confirmIfDirty(dirty: boolean, action: () => void, options: Partial<ConfirmationModalProps> = {}) {
     if (!dirty) {
diff --git a/apps/admin-x-design-system/styles.css b/apps/admin-x-design-system/styles.css
new file mode 100644
index 00000000000..0780fcd7853
--- /dev/null
+++ b/apps/admin-x-design-system/styles.css
@@ -0,0 +1,99 @@
+@import './preflight.css';
+
+@import 'tailwindcss/base';
+@import 'tailwindcss/components';
+@import 'tailwindcss/utilities';
+
+/* Defaults */
+@layer base {
+    /* This just serves as a placeholder; we actually load Inter from a font file in Ember admin */
+    @font-face {
+        font-family: "Inter";
+        src: local("Inter") format("truetype-variations");
+        font-weight: 100 900;
+    }
+
+    .admin-x-base {
+        & {
+            @apply font-sans text-black text-base leading-normal;
+        }
+
+        h1, h2, h3, h4, h5 {
+            @apply font-bold tracking-tight leading-tighter;
+        }
+
+        h1 {
+            @apply text-4xl leading-supertight;
+        }
+
+        h2 {
+            @apply text-2xl;
+        }
+
+        h3 {
+            @apply text-xl;
+        }
+
+        h4 {
+            @apply text-lg;
+        }
+
+        h5 {
+            @apply text-md leading-supertight;
+        }
+
+        h6 {
+            @apply text-md leading-normal;
+        }
+    }
+}
+
+.admin-x-base {
+    line-height: 1.5;
+    -ms-text-size-adjust: 100%;
+    -webkit-text-size-adjust: 100%;
+
+    text-rendering: optimizeLegibility;
+    -webkit-font-smoothing: antialiased;
+    -moz-osx-font-smoothing: grayscale;
+    -webkit-text-size-adjust: 100%;
+    letter-spacing: unset;
+
+    height: 100vh;
+    width: 100%;
+    overflow-x: hidden;
+    overflow-y: auto;
+}
+
+
+@media (max-width: 860px) {
+    .admin-x-base {
+        height: calc(100vh - 55px);
+    }
+}
+
+.admin-x-base.dark {
+    color: #FAFAFB;
+}
+
+.admin-x-base.dark .gh-loading-orb-container {
+    background-color: #000000;
+}
+
+.admin-x-base.dark .gh-loading-orb {
+    filter: invert(100%);
+}
+
+.admin-x-base .no-scrollbar::-webkit-scrollbar {
+    display: none; /* Chrome */
+}
+
+.admin-x-base .no-scrollbar {
+    -ms-overflow-style: none;  /* IE and Edge */
+    scrollbar-width: none;  /* Firefox */
+}
+
+/* Prose classes are for formatting arbitrary HTML that comes from the API */
+.gh-prose-links a {
+    color: #30CF43;
+}
diff --git a/apps/admin-x-design-system/tailwind.cjs b/apps/admin-x-design-system/tailwind.cjs
new file mode 100644
index 00000000000..e4cfe82b866
--- /dev/null
+++ b/apps/admin-x-design-system/tailwind.cjs
@@ -0,0 +1,7 @@
+// eslint-disable-next-line @typescript-eslint/no-var-requires
+const config = require('./tailwind.config');
+
+module.exports = selector => ({
+    ...config,
+    important: selector
+});
diff --git a/apps/admin-x-design-system/tailwind.config.cjs b/apps/admin-x-design-system/tailwind.config.cjs
new file mode 100644
index 00000000000..27e8958eeff
--- /dev/null
+++ b/apps/admin-x-design-system/tailwind.config.cjs
@@ -0,0 +1,295 @@
+// Used for eslint and storybook. Styles should not be compiled directly with this, they should be compiled by calling the function in tailwind.cjs
+module.exports = {
+    content: ['./src/**/*.{js,ts,jsx,tsx}'],
+    important: '.admin-x-design-system',
+
+    corePlugins: {
+        preflight: false // we're providing our own scoped CSS reset
+    },
+    darkMode: 'class',
+    theme: {
+        screens: {
+            sm: '480px',
+            md: '640px',
+            lg: '1024px',
+            xl: '1280px',
+            tablet: '860px'
+        },
+        colors: {
+            transparent: 'transparent',
+            current: 'currentColor',
+            white: '#FFF',
+            black: '#15171A',
+            grey: {
+                DEFAULT: '#ABB4BE',
+                50: '#FAFAFB',
+                75: '#F9FAFB',
+                100: '#F4F5F6',
+                150: '#F1F3F4',
+                200: '#EBEEF0',
+                300: '#DDE1E5',
+                400: '#CED4D9',
+                500: '#AEB7C1',
+                600: '#95A1AD',
+                700: '#7C8B9A',
+                800: '#626D79',
+                900: '#394047',
+                925: '#2E3338',
+                950: '#222427'
+            },
+            green: {
+                DEFAULT: '#30CF43',
+                100: '#E1F9E4',
+                400: '#58DA67',
+                500: '#30CF43',
+                600: '#2AB23A'
+            },
+            blue: {
+                DEFAULT: '#14B8FF',
+                100: '#DBF4FF',
+                400: '#42C6FF',
+                500: '#14B8FF',
+                600: '#00A4EB'
+            },
+            purple: {
+                DEFAULT: '#8E42FF',
+                100: '#EDE0FF',
+                400: '#A366FF',
+                500: '#8E42FF',
+                600: '7B1FFF'
+            },
+            pink: {
+                DEFAULT: '#FB2D8D',
+                100: '#FFDFEE',
+                400: '#FF5CA8',
+                500: '#FB2D8D',
+                600: '#F70878'
+            },
+            red: {
+                DEFAULT: '#F50B23',
+                100: '#FFE0E0',
+                400: '#F9394C',
+                500: '#F50B23',
+                600: '#DC091E'
+            },
+            yellow: {
+                DEFAULT: '#FFB41F',
+                100: '#FFF1D6',
+                400: '#FFC247',
+                500: '#FFB41F',
+                600: '#F0A000'
+            },
+            lime: {
+                DEFAULT: '#B5FF18'
+            }
+        },
+        fontFamily: {
+            inter: 'Inter',
+            sans: 'Inter, -apple-system, BlinkMacSystemFont, avenir next, avenir, helvetica neue, helvetica, ubuntu, roboto, noto, segoe ui, arial, sans-serif',
+            serif: 'Georgia, serif',
+            mono: 'Consolas, Liberation Mono, Menlo, Courier, monospace',
+            inherit: 'inherit'
+        },
+        boxShadow: {
+            DEFAULT: '0 0 1px rgba(0,0,0,.05), 0 5px 18px rgba(0,0,0,.08)',
+            sm: '0 0 1px rgba(0,0,0,.12), 0 1px 6px rgba(0,0,0,0.03), 0 6px 10px -8px rgba(0,0,0,.1)',
+            md: '0 0 1px rgba(0,0,0,.05), 0 8px 28px rgba(0,0,0,.12)',
+            lg: '0 0 7px rgba(0, 0, 0, 0.08), 0 2.1px 2.2px -5px rgba(0, 0, 0, 0.011), 0 5.1px 5.3px -5px rgba(0, 0, 0, 0.016), 0 9.5px 10px -5px rgba(0, 0, 0, 0.02), 0 17px 17.9px -5px rgba(0, 0, 0, 0.024), 0 31.8px 33.4px -5px rgba(0, 0, 0, 0.029), 0 76px 80px -5px rgba(0, 0, 0, 0.04)',
+            xl: '0 2.8px 2.2px rgba(0, 0, 0, 0.02), 0 6.7px 5.3px rgba(0, 0, 0, 0.028), 0 12.5px 10px rgba(0, 0, 0, 0.035), 0 22.3px 17.9px rgba(0, 0, 0, 0.042), 0 41.8px 33.4px rgba(0, 0, 0, 0.05), 0 100px 80px rgba(0, 0, 0, 0.07)',
+            inner: 'inset 0 0 4px 0 rgb(0 0 0 / 0.08)',
+            none: '0 0 #0000'
+        },
+        extend: {
+            keyframes: {
+                toasterIn: {
+                    '0.00%': {
+                        opacity: '0',
+                        transform: 'translateX(-232.05px)'
+                    },
+                    '26.52%': {
+                        opacity: '0.5',
+                        transform: 'translateX(5.90px)'
+                    },
+                    '63.26%': {
+                        opacity: '1',
+                        transform: 'translateX(-1.77px)'
+                    },
+                    '100.00%': {
+                        transform: 'translateX(0px)'
+                    }
+                },
+                toasterTopIn: {
+                    '0.00%': {
+                        opacity: '0',
+                        transform: 'translateY(-82px)'
+                    },
+                    '26.52%': {
+                        opacity: '0.5',
+                        transform: 'translateY(5.90px)'
+                    },
+                    '63.26%': {
+                        opacity: '1',
+                        transform: 'translateY(-1.77px)'
+                    },
+                    '100.00%': {
+                        transform: 'translateY(0px)'
+                    }
+                },
+                toasterOut: {
+                    '0%': {
+                        opacity: '1'
+                    },
+                    '100%': {
+                        opacity: '0'
+                    }
+                },
+                fadeIn: {
+                    '0%': {
+                        opacity: '0'
+                    },
+                    '100%': {
+                        opacity: '1'
+                    }
+                },
+                fadeOut: {
+                    '0%': {
+                        opacity: '1'
+                    },
+                    '100%': {
+                        opacity: '0'
+                    }
+                },
+                modalIn: {
+                    '0%': {
+                        transform: 'translateY(32px)'
+                    },
+                    '100%': {
+                        transform: 'translateY(0px)'
+                    }
+                },
+                modalInReverse: {
+                    '0%': {
+                        transform: 'translateY(-32px)'
+                    },
+                    '100%': {
+                        transform: 'translateY(0px)'
+                    }
+                },
+                spin: {
+                    '0%': {
+                        transform: 'rotate(0deg)'
+                    },
+                    '100%': {
+                        transform: 'rotate(360deg)'
+                    }
+                }
+            },
+            animation: {
+                'toaster-in': 'toasterIn 0.8s cubic-bezier(0.445, 0.050, 0.550, 0.950)',
+                'toaster-out': 'toasterOut 0.4s 0s 1 ease forwards',
+                'toaster-top-in': 'toasterTopIn 0.8s cubic-bezier(0.445, 0.050, 0.550, 0.950)',
+                'fade-in': 'fadeIn 0.15s ease forwards',
+                'fade-out': 'fadeOut 0.15s ease forwards',
+                'setting-highlight-fade-out': 'fadeOut 0.2s 1.4s ease forwards',
+                'modal-backdrop-in': 'fadeIn 0.15s ease forwards',
+                'modal-in': 'modalIn 0.25s ease forwards',
+                'modal-in-reverse': 'modalInReverse 0.25s ease forwards',
+                spin: 'spin 1s linear infinite'
+            },
+            spacing: {
+                px: '1px',
+                0: '0px',
+                0.5: '0.2rem',
+                1: '0.4rem',
+                1.5: '0.6rem',
+                2: '0.8rem',
+                2.5: '1rem',
+                3: '1.2rem',
+                3.5: '1.4rem',
+                4: '1.6rem',
+                5: '2rem',
+                6: '2.4rem',
+                7: '2.8rem',
+                8: '3.2rem',
+                9: '3.6rem',
+                10: '4rem',
+                11: '4.4rem',
+                12: '4.8rem',
+                14: '5.6rem',
+                16: '6.4rem',
+                18: '7.2rem',
+                20: '8rem',
+                24: '9.6rem',
+                28: '11.2rem',
+                32: '12.8rem',
+                36: '14.4rem',
+                40: '16rem',
+                44: '17.6rem',
+                48: '19.2rem',
+                52: '20.8rem',
+                56: '22.4rem',
+                60: '24rem',
+                64: '25.6rem',
+                72: '28.8rem',
+                80: '32rem',
+                96: '38.4rem'
+            },
+            maxWidth: {
+                none: 'none',
+                0: '0rem',
+                xs: '32rem',
+                sm: '38.4rem',
+                md: '44.8rem',
+                lg: '51.2rem',
+                xl: '57.6rem',
+                '2xl': '67.2rem',
+                '3xl': '76.8rem',
+                '4xl': '89.6rem',
+                '5xl': '102.4rem',
+                '6xl': '115.2rem',
+                '7xl': '128rem',
+                '8xl': '140rem',
+                '9xl': '156rem',
+                full: '100%',
+                min: 'min-content',
+                max: 'max-content',
+                fit: 'fit-content',
+                prose: '65ch'
+            },
+            borderRadius: {
+                sm: '0.3rem',
+                DEFAULT: '0.4rem',
+                md: '0.6rem',
+                lg: '0.8rem',
+                xl: '1.2rem',
+                '2xl': '1.6rem',
+                '3xl': '2.4rem',
+                full: '9999px'
+            },
+            fontSize: {
+                '2xs': '1.0rem',
+                base: '1.45rem',
+                xs: '1.2rem',
+                sm: '1.35rem',
+                md: '1.45rem',
+                lg: '1.75rem',
+                xl: '2rem',
+                '2xl': '2.4rem',
+                '3xl': '3rem',
+                '4xl': '3.6rem',
+                '5xl': ['4.2rem', '1.15'],
+                '6xl': ['6rem', '1'],
+                '7xl': ['7.2rem', '1'],
+                '8xl': ['9.6rem', '1'],
+                '9xl': ['12.8rem', '1'],
+                inherit: 'inherit'
+            },
+            lineHeight: {
+                base: '1.5em',
+                tight: '1.35em',
+                tighter: '1.25em',
+                supertight: '1.1em'
+            }
+        }
+    }
+};
diff --git a/apps/admin-x-design-system/test/.eslintrc.cjs b/apps/admin-x-design-system/test/.eslintrc.cjs
new file mode 100644
index 00000000000..6fe6dc1504a
--- /dev/null
+++ b/apps/admin-x-design-system/test/.eslintrc.cjs
@@ -0,0 +1,7 @@
+module.exports = {
+    parser: '@typescript-eslint/parser',
+    plugins: ['ghost'],
+    extends: [
+        'plugin:ghost/test'
+    ]
+};
diff --git a/apps/admin-x-design-system/test/hello.test.ts b/apps/admin-x-design-system/test/hello.test.ts
new file mode 100644
index 00000000000..e66b88fad49
--- /dev/null
+++ b/apps/admin-x-design-system/test/hello.test.ts
@@ -0,0 +1,8 @@
+import assert from 'assert/strict';
+
+describe('Hello world', function () {
+    it('Runs a test', function () {
+        // TODO: Write me!
+        assert.ok(require('../'));
+    });
+});
diff --git a/apps/admin-x-design-system/tsconfig.declaration.json b/apps/admin-x-design-system/tsconfig.declaration.json
new file mode 100644
index 00000000000..294527b1a6f
--- /dev/null
+++ b/apps/admin-x-design-system/tsconfig.declaration.json
@@ -0,0 +1,11 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "noEmit": false,
+    "declaration": true,
+    "emitDeclarationOnly": true,
+    "declarationDir": "./types"
+  },
+  "include": ["src"],
+  "exclude": ["src/**/*.stories.tsx"]
+}
diff --git a/apps/admin-x-design-system/tsconfig.json b/apps/admin-x-design-system/tsconfig.json
new file mode 100644
index 00000000000..ee1c2d7d2d1
--- /dev/null
+++ b/apps/admin-x-design-system/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+      "target": "ESNext",
+      "lib": ["DOM", "DOM.Iterable", "ESNext"],
+      "module": "ESNext",
+      "skipLibCheck": true,
+      "types": ["vite/client"],
+
+      /* Bundler mode */
+      "moduleResolution": "bundler",
+      "resolveJsonModule": true,
+      "isolatedModules": true,
+      "jsx": "react-jsx",
+
+      /* Linting */
+      "strict": true,
+      "noUnusedLocals": true,
+      "noUnusedParameters": true,
+      "noFallthroughCasesInSwitch": true
+    },
+    "include": ["src"],
+    "references": [{ "path": "./tsconfig.node.json" }]
+  }
diff --git a/apps/admin-x-design-system/tsconfig.node.json b/apps/admin-x-design-system/tsconfig.node.json
new file mode 100644
index 00000000000..364bc0ea553
--- /dev/null
+++ b/apps/admin-x-design-system/tsconfig.node.json
@@ -0,0 +1,10 @@
+{
+  "compilerOptions": {
+    "composite": true,
+    "skipLibCheck": true,
+    "module": "ESNext",
+    "moduleResolution": "bundler",
+    "allowSyntheticDefaultImports": true
+  },
+  "include": ["vite.config.ts", "package.json"]
+}
diff --git a/apps/admin-x-design-system/vite.config.ts b/apps/admin-x-design-system/vite.config.ts
new file mode 100644
index 00000000000..fa9cfad51ec
--- /dev/null
+++ b/apps/admin-x-design-system/vite.config.ts
@@ -0,0 +1,65 @@
+import react from '@vitejs/plugin-react';
+import glob from 'glob';
+import {resolve} from 'path';
+import svgr from 'vite-plugin-svgr';
+import {defineConfig} from 'vitest/config';
+
+// https://vitejs.dev/config/
+export default (function viteConfig() {
+    return defineConfig({
+        plugins: [
+            svgr(),
+            react()
+        ],
+        define: {
+            'process.env.NODE_ENV': JSON.stringify(process.env.NODE_ENV),
+            'process.env.VITEST_SEGFAULT_RETRY': 3
+        },
+        preview: {
+            port: 4174
+        },
+        build: {
+            minify: false,
+            sourcemap: true,
+            outDir: 'es',
+            lib: {
+                formats: ['es'],
+                entry: glob.sync(resolve(__dirname, 'src/**/*.{ts,tsx}')).reduce((entries, path) => {
+                    if (path.includes('.stories.') || path.endsWith('.d.ts')) {
+                        return entries;
+                    }
+
+                    const outPath = path.replace(resolve(__dirname, 'src') + '/', '').replace(/\.(ts|tsx)$/, '');
+                    entries[outPath] = path;
+                    return entries;
+                }, {} as Record<string, string>)
+            },
+            commonjsOptions: {
+                include: [/packages/, /node_modules/]
+            },
+            rollupOptions: {
+                external: (source) => {
+                    if (source.startsWith('.')) {
+                        return false;
+                    }
+
+                    if (source.includes('node_modules')) {
+                        return true;
+                    }
+
+                    return !source.includes(__dirname);
+                }
+            }
+        },
+        test: {
+            globals: true, // required for @testing-library/jest-dom extensions
+            environment: 'jsdom',
+            include: ['./test/unit/**/*'],
+            testTimeout: process.env.TIMEOUT ? parseInt(process.env.TIMEOUT) : 10000,
+            ...(process.env.CI && { // https://github.com/vitest-dev/vitest/issues/1674
+                minThreads: 1,
+                maxThreads: 2
+            })
+        }
+    });
+});
diff --git a/apps/admin-x-settings/.eslintignore b/apps/admin-x-settings/.eslintignore
new file mode 100644
index 00000000000..9944eccea22
--- /dev/null
+++ b/apps/admin-x-settings/.eslintignore
@@ -0,0 +1 @@
+tailwind.config.cjs
diff --git a/apps/admin-x-settings/package.json b/apps/admin-x-settings/package.json
index 6e47942169a..98b35e1e20b 100644
--- a/apps/admin-x-settings/package.json
+++ b/apps/admin-x-settings/package.json
@@ -30,65 +30,53 @@
     "build": "tsc && vite build",
     "lint": "yarn run lint:js",
     "lint:js": "eslint --ext .js,.ts,.cjs,.tsx --cache src test",
-    "test:unit": "yarn build && vitest run",
+    "test:unit": "yarn nx build && vitest run",
     "test:acceptance": "NODE_OPTIONS='--experimental-specifier-resolution=node --no-warnings' VITE_TEST=true playwright test",
     "test:acceptance:slowmo": "TIMEOUT=100000 PLAYWRIGHT_SLOWMO=100 yarn test:acceptance --headed",
     "test:acceptance:full": "ALL_BROWSERS=1 yarn test:acceptance",
-    "preview": "vite preview",
-    "storybook": "storybook dev -p 6006",
-    "build-storybook": "storybook build"
+    "preview": "vite preview"
   },
   "dependencies": {
     "@codemirror/lang-html": "^6.4.5",
-    "@dnd-kit/core": "6.0.8",
-    "@dnd-kit/sortable": "7.0.2",
-    "@ebay/nice-modal-react": "1.2.13",
-    "@sentry/react": "7.70.0",
     "@tanstack/react-query": "4.36.1",
-    "@tryghost/color-utils": "0.1.24",
+    "@tryghost/color-utils": "0.2.0",
     "@tryghost/limit-service": "^1.2.10",
     "@tryghost/nql": "0.11.0",
-    "@tryghost/timezone-data": "0.3.8",
-    "@uiw/react-codemirror": "^4.21.9",
-    "clsx": "2.0.0",
+    "@tryghost/timezone-data": "0.4.1",
     "react": "18.2.0",
-    "react-colorful": "^5.1.2",
     "react-dom": "18.2.0",
     "validator": "7.2.0"
   },
   "devDependencies": {
     "@playwright/test": "1.38.1",
-    "@storybook/addon-essentials": "7.4.0",
-    "@storybook/addon-interactions": "7.4.0",
-    "@storybook/addon-links": "7.4.0",
-    "@storybook/addon-styling": "1.3.7",
-    "@storybook/blocks": "7.4.0",
-    "@storybook/react": "7.4.0",
-    "@storybook/react-vite": "7.4.0",
-    "@storybook/testing-library": "0.2.2",
-    "@tailwindcss/forms": "0.5.6",
-    "@tailwindcss/line-clamp": "0.4.4",
-    "@types/react": "18.2.28",
-    "@types/react-dom": "18.2.13",
-    "@types/validator": "13.11.3",
-    "@vitejs/plugin-react": "4.1.0",
-    "autoprefixer": "10.4.16",
-    "concurrently": "8.2.2",
+    "@tryghost/admin-x-design-system": "0.0.0",
+    "@types/react": "18.2.37",
+    "@types/react-dom": "18.2.15",
+    "@types/validator": "13.11.6",
+    "@vitejs/plugin-react": "4.1.1",
     "eslint-plugin-react-hooks": "4.6.0",
     "eslint-plugin-react-refresh": "0.4.3",
     "eslint-plugin-tailwindcss": "3.13.0",
-    "postcss": "8.4.31",
-    "postcss-import": "15.1.0",
-    "prop-types": "15.8.1",
-    "react-hot-toast": "2.4.1",
-    "react-select": "5.7.7",
-    "rollup-plugin-node-builtins": "2.1.2",
-    "storybook": "7.4.0",
     "stylelint": "15.10.3",
-    "tailwindcss": "3.3.5",
     "vite": "4.5.0",
     "vite-plugin-css-injected-by-js": "^3.3.0",
     "vite-plugin-svgr": "3.3.0",
     "vitest": "0.34.3"
+  },
+  "nx": {
+    "targets": {
+      "build": {
+        "dependsOn": [
+          "build",
+          {"projects": ["@tryghost/admin-x-design-system"], "target": "build"}
+        ]
+      },
+      "test:acceptance": {
+        "dependsOn": [
+          "test:acceptance",
+          {"projects": ["@tryghost/admin-x-design-system"], "target": "build"}
+        ]
+      }
+    }
   }
 }
diff --git a/apps/admin-x-settings/src/App.tsx b/apps/admin-x-settings/src/App.tsx
index 39b4ea0073b..3465fda4801 100644
--- a/apps/admin-x-settings/src/App.tsx
+++ b/apps/admin-x-settings/src/App.tsx
@@ -1,16 +1,12 @@
-import DesignSystemProvider from './admin-x-ds/providers/DesignSystemProvider';
 import GlobalDataProvider from './components/providers/GlobalDataProvider';
 import MainContent from './MainContent';
-import NiceModal from '@ebay/nice-modal-react';
 import RoutingProvider, {ExternalLink} from './components/providers/RoutingProvider';
-import clsx from 'clsx';
 import {DefaultHeaderTypes} from './unsplash/UnsplashTypes';
+import {DesignSystemApp} from '@tryghost/admin-x-design-system';
 import {FetchKoenigLexical, OfficialTheme, ServicesProvider} from './components/providers/ServiceProvider';
-import {GlobalDirtyStateProvider} from './hooks/useGlobalDirtyState';
 import {QueryClient, QueryClientProvider} from '@tanstack/react-query';
 import {ScrollSectionProvider} from './hooks/useScrollSection';
 import {ErrorBoundary as SentryErrorBoundary} from '@sentry/react';
-import {Toaster} from 'react-hot-toast';
 import {UpgradeStatusType} from './utils/globalTypes';
 import {ZapierTemplate} from './components/settings/advanced/integrations/ZapierModal';
 
@@ -42,12 +38,6 @@ const queryClient = new QueryClient({
 });
 
 function App({ghostVersion, officialThemes, zapierTemplates, externalNavigate, darkMode = false, unsplashConfig, fetchKoenigLexical, sentryDSN, onUpdate, onInvalidate, onDelete, upgradeStatus}: AppProps) {
-    const appClassName = clsx(
-        'admin-x-settings admin-x-base',
-        darkMode && 'dark'
-        //'!h-[calc(100vh-55px)] w-full overflow-y-auto overflow-x-hidden tablet:!h-[100vh]'
-    );
-
     return (
         <SentryErrorBoundary>
             <QueryClientProvider client={queryClient}>
@@ -55,20 +45,12 @@ function App({ghostVersion, officialThemes, zapierTemplates, externalNavigate, d
                     <GlobalDataProvider>
                         <ScrollSectionProvider>
                             <RoutingProvider externalNavigate={externalNavigate}>
-                                <GlobalDirtyStateProvider>
-                                    <DesignSystemProvider>
-                                        <div className={appClassName} id="admin-x-root" style={{
-                                            // height: '100vh',
-                                            // width: '100%'
-                                        }}
-                                        >
-                                            <Toaster />
-                                            <NiceModal.Provider>
-                                                <MainContent />
-                                            </NiceModal.Provider>
-                                        </div>
-                                    </DesignSystemProvider>
-                                </GlobalDirtyStateProvider>
+                                <DesignSystemApp className='admin-x-settings' darkMode={darkMode} fetchKoenigLexical={fetchKoenigLexical} id="admin-x-settings" style={{
+                                    // height: '100vh',
+                                    // width: '100%'
+                                }}>
+                                    <MainContent />
+                                </DesignSystemApp>
                             </RoutingProvider>
                         </ScrollSectionProvider>
                     </GlobalDataProvider>
diff --git a/apps/admin-x-settings/src/MainContent.tsx b/apps/admin-x-settings/src/MainContent.tsx
index 8bcc9a3a3f3..201ed8b7eb8 100644
--- a/apps/admin-x-settings/src/MainContent.tsx
+++ b/apps/admin-x-settings/src/MainContent.tsx
@@ -1,13 +1,12 @@
 import ExitSettingsButton from './components/ExitSettingsButton';
-import Heading from './admin-x-ds/global/Heading';
 import Settings from './components/Settings';
 import Sidebar from './components/Sidebar';
 import Users from './components/settings/general/Users';
 import useRouting from './hooks/useRouting';
+import {Heading, topLevelBackdropClasses} from '@tryghost/admin-x-design-system';
 import {ReactNode, useEffect} from 'react';
 import {canAccessSettings, isEditorUser} from './api/users';
 import {toast} from 'react-hot-toast';
-import {topLevelBackdropClasses} from './admin-x-ds/global/modal/Modal';
 import {useGlobalData} from './components/providers/GlobalDataProvider';
 
 const Page: React.FC<{children: ReactNode}> = ({children}) => {
diff --git a/apps/admin-x-settings/src/admin-x-ds/experimental/BlurryStickyFooter.tsx b/apps/admin-x-settings/src/admin-x-ds/experimental/BlurryStickyFooter.tsx
deleted file mode 100644
index d95a03230be..00000000000
--- a/apps/admin-x-settings/src/admin-x-ds/experimental/BlurryStickyFooter.tsx
+++ /dev/null
@@ -1,49 +0,0 @@
-import React from 'react';
-import clsx from 'clsx';
-
-interface StickyFooterProps {
-    shiftY?: string;
-    children?: React.ReactNode;
-}
-
-const BlurryStickyFooter: React.FC<StickyFooterProps> = ({
-    shiftY,
-    children
-}) => {
-    const containerClasses = clsx(
-        'w-100 sticky z-[9997] m-0 box-border p-0',
-        'backdrop-blur',
-        'bg-[rgba(255,255,255,0.4)]'
-    );
-    const containerBottom = shiftY ? `calc(${shiftY})` : '0';
-    const containerHeight = `82px`;
-
-    const contentClasses = clsx(
-        `sticky z-[9999] flex items-center justify-between`,
-        'h-[96px]'
-    );
-    const contentBottom = '0';
-    const contentHeight = `82px`;
-
-    return (
-        <>
-            <div className={containerClasses}
-                style={{
-                    bottom: containerBottom,
-                    height: containerHeight
-                }}
-            >
-                <div className={contentClasses}
-                    style={{
-                        bottom: contentBottom,
-                        height: contentHeight
-                    }}
-                >
-                    {children}
-                </div>
-            </div>
-        </>
-    );
-};
-
-export default BlurryStickyFooter;
\ No newline at end of file
diff --git a/apps/admin-x-settings/src/admin-x-ds/experimental/ExampleButton.stories.ts b/apps/admin-x-settings/src/admin-x-ds/experimental/ExampleButton.stories.ts
deleted file mode 100644
index 1360680661a..00000000000
--- a/apps/admin-x-settings/src/admin-x-ds/experimental/ExampleButton.stories.ts
+++ /dev/null
@@ -1,44 +0,0 @@
-import type {Meta, StoryObj} from '@storybook/react';
-
-import {ExampleButton} from './ExampleButton';
-
-// More on how to set up stories at: https://storybook.js.org/docs/react/writing-stories/introduction
-const meta = {
-    title: 'Experimental / Example Button',
-    component: ExampleButton,
-    tags: ['autodocs'],
-    argTypes: {
-        backgroundColor: {control: 'color'}
-    }
-} satisfies Meta<typeof ExampleButton>;
-
-export default meta;
-type Story = StoryObj<typeof meta>;
-
-// More on writing stories with args: https://storybook.js.org/docs/react/writing-stories/args
-export const Primary: Story = {
-    args: {
-        primary: true,
-        label: 'Button'
-    }
-};
-
-export const Secondary: Story = {
-    args: {
-        label: 'Button'
-    }
-};
-
-export const Large: Story = {
-    args: {
-        size: 'large',
-        label: 'Button'
-    }
-};
-
-export const Small: Story = {
-    args: {
-        size: 'small',
-        label: 'Button'
-    }
-};
diff --git a/apps/admin-x-settings/src/admin-x-ds/experimental/ExampleButton.tsx b/apps/admin-x-settings/src/admin-x-ds/experimental/ExampleButton.tsx
deleted file mode 100644
index 69be03746e9..00000000000
--- a/apps/admin-x-settings/src/admin-x-ds/experimental/ExampleButton.tsx
+++ /dev/null
@@ -1,47 +0,0 @@
-import './button.css';
-
-interface ExampleButtonProps {
-  /**
-   * Is this the principal call to action on the page?
-   */
-  primary?: boolean;
-  /**
-   * What background color to use
-   */
-  backgroundColor?: string;
-  /**
-   * How large should the button be?
-   */
-  size?: 'small' | 'medium' | 'large';
-  /**
-   * Button contents
-   */
-  label: string;
-  /**
-   * Optional click handler
-   */
-  onClick?: () => void;
-}
-
-/**
- * Primary UI component
- */
-export const ExampleButton = ({
-    primary = false,
-    size = 'medium',
-    backgroundColor,
-    label,
-    ...props
-}: ExampleButtonProps) => {
-    const mode = primary ? 'storybook-button--primary' : 'storybook-button--secondary';
-    return (
-        <button
-            className={['storybook-button', `storybook-button--${size}`, mode].join(' ')}
-            style={{backgroundColor}}
-            type="button"
-            {...props}
-        >
-            {label}
-        </button>
-    );
-};
diff --git a/apps/admin-x-settings/src/admin-x-ds/experimental/Header.stories.ts b/apps/admin-x-settings/src/admin-x-ds/experimental/Header.stories.ts
deleted file mode 100644
index 26f70b8aea0..00000000000
--- a/apps/admin-x-settings/src/admin-x-ds/experimental/Header.stories.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import {Header} from './Header';
-import type {Meta, StoryObj} from '@storybook/react';
-
-const meta = {
-    title: 'Experimental / Header',
-    component: Header,
-    // This component will have an automatically generated Autodocs entry: https://storybook.js.org/docs/react/writing-docs/autodocs
-    tags: ['autodocs'],
-    parameters: {
-    // More on how to position stories at: https://storybook.js.org/docs/react/configure/story-layout
-        layout: 'fullscreen'
-    }
-} satisfies Meta<typeof Header>;
-
-export default meta;
-type Story = StoryObj<typeof meta>;
-
-export const LoggedIn: Story = {
-    args: {
-        user: {
-            name: 'Jane Doe'
-        }
-    }
-};
-
-export const LoggedOut: Story = {};
diff --git a/apps/admin-x-settings/src/admin-x-ds/experimental/Header.tsx b/apps/admin-x-settings/src/admin-x-ds/experimental/Header.tsx
deleted file mode 100644
index b55ae7c02d6..00000000000
--- a/apps/admin-x-settings/src/admin-x-ds/experimental/Header.tsx
+++ /dev/null
@@ -1,54 +0,0 @@
-import './header.css';
-import {ExampleButton} from './ExampleButton';
-
-type User = {
-  name: string;
-};
-
-interface HeaderProps {
-  user?: User;
-  onLogin: () => void;
-  onLogout: () => void;
-  onCreateAccount: () => void;
-}
-
-export const Header = ({user, onLogin, onLogout, onCreateAccount}: HeaderProps) => (
-    <header>
-        <div className="storybook-wrapper">
-            <div>
-                <svg height="32" viewBox="0 0 32 32" width="32" xmlns="http://www.w3.org/2000/svg">
-                    <g fill="none" fillRule="evenodd">
-                        <path
-                            d="M10 0h12a10 10 0 0110 10v12a10 10 0 01-10 10H10A10 10 0 010 22V10A10 10 0 0110 0z"
-                            fill="#FFF"
-                        />
-                        <path
-                            d="M5.3 10.6l10.4 6v11.1l-10.4-6v-11zm11.4-6.2l9.7 5.5-9.7 5.6V4.4z"
-                            fill="#555AB9"
-                        />
-                        <path
-                            d="M27.2 10.6v11.2l-10.5 6V16.5l10.5-6zM15.7 4.4v11L6 10l9.7-5.5z"
-                            fill="#91BAF8"
-                        />
-                    </g>
-                </svg>
-                <h1>Acme</h1>
-            </div>
-            <div>
-                {user ? (
-                    <>
-                        <span className="storybook-welcome">
-              Welcome, <b>{user.name}</b>!
-                        </span>
-                        <ExampleButton label="Log out" size="small" onClick={onLogout} />
-                    </>
-                ) : (
-                    <>
-                        <ExampleButton label="Log in" size="small" onClick={onLogin} />
-                        <ExampleButton label="Sign up" size="small" primary onClick={onCreateAccount} />
-                    </>
-                )}
-            </div>
-        </div>
-    </header>
-);
diff --git a/apps/admin-x-settings/src/admin-x-ds/experimental/Page.stories.ts b/apps/admin-x-settings/src/admin-x-ds/experimental/Page.stories.ts
deleted file mode 100644
index 0da02551892..00000000000
--- a/apps/admin-x-settings/src/admin-x-ds/experimental/Page.stories.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-import {userEvent, within} from '@storybook/testing-library';
-import type {Meta, StoryObj} from '@storybook/react';
-
-import {Page} from './Page';
-
-const meta = {
-    title: 'Experimental / Page',
-    component: Page,
-    parameters: {
-    // More on how to position stories at: https://storybook.js.org/docs/react/configure/story-layout
-        layout: 'fullscreen'
-    }
-} satisfies Meta<typeof Page>;
-
-export default meta;
-type Story = StoryObj<typeof meta>;
-
-export const LoggedOut: Story = {};
-
-// More on interaction testing: https://storybook.js.org/docs/react/writing-tests/interaction-testing
-export const LoggedIn: Story = {
-    play: async ({canvasElement}) => {
-        const canvas = within(canvasElement);
-        const loginButton = await canvas.getByRole('button', {
-            name: /Log in/i
-        });
-        await userEvent.click(loginButton);
-    }
-};
diff --git a/apps/admin-x-settings/src/admin-x-ds/experimental/Page.tsx b/apps/admin-x-settings/src/admin-x-ds/experimental/Page.tsx
deleted file mode 100644
index b31ddf2ec29..00000000000
--- a/apps/admin-x-settings/src/admin-x-ds/experimental/Page.tsx
+++ /dev/null
@@ -1,73 +0,0 @@
-import React from 'react';
-
-import './page.css';
-import {Header} from './Header';
-
-type User = {
-  name: string;
-};
-
-export const Page: React.FC = () => {
-    const [user, setUser] = React.useState<User>();
-
-    return (
-        <article>
-            <Header
-                user={user}
-                onCreateAccount={() => setUser({name: 'Jane Doe'})}
-                onLogin={() => setUser({name: 'Jane Doe'})}
-                onLogout={() => setUser(undefined)}
-            />
-
-            <section>
-                <h2>Pages in Storybook</h2>
-                <p>
-          We recommend building UIs with a{' '}
-                    <a href="https://componentdriven.org" rel="noopener noreferrer" target="_blank">
-                        <strong>component-driven</strong>
-                    </a>{' '}
-          process starting with atomic components and ending with pages.
-                </p>
-                <p>
-          Render pages with mock data. This makes it easy to build and review page states without
-          needing to navigate to them in your app. Here are some handy patterns for managing page
-          data in Storybook:
-                </p>
-                <ul>
-                    <li>
-            Use a higher-level connected component. Storybook helps you compose such data from the
-            &quot;args&quot; of child component stories
-                    </li>
-                    <li>
-            Assemble data in the page component from your services. You can mock these services out
-            using Storybook.
-                    </li>
-                </ul>
-                <p>
-          Get a guided tutorial on component-driven development at{' '}
-                    <a href="https://storybook.js.org/tutorials/" rel="noopener noreferrer" target="_blank">
-            Storybook tutorials
-                    </a>
-          . Read more in the{' '}
-                    <a href="https://storybook.js.org/docs" rel="noopener noreferrer" target="_blank">
-            docs
-                    </a>
-          .
-                </p>
-                <div className="tip-wrapper">
-                    <span className="tip">Tip</span> Adjust the width of the canvas with the{' '}
-                    <svg height="10" viewBox="0 0 12 12" width="10" xmlns="http://www.w3.org/2000/svg">
-                        <g fill="none" fillRule="evenodd">
-                            <path
-                                d="M1.5 5.2h4.8c.3 0 .5.2.5.4v5.1c-.1.2-.3.3-.4.3H1.4a.5.5 0 01-.5-.4V5.7c0-.3.2-.5.5-.5zm0-2.1h6.9c.3 0 .5.2.5.4v7a.5.5 0 01-1 0V4H1.5a.5.5 0 010-1zm0-2.1h9c.3 0 .5.2.5.4v9.1a.5.5 0 01-1 0V2H1.5a.5.5 0 010-1zm4.3 5.2H2V10h3.8V6.2z"
-                                fill="#999"
-                                id="a"
-                            />
-                        </g>
-                    </svg>
-          Viewports addon in the toolbar
-                </div>
-            </section>
-        </article>
-    );
-};
diff --git a/apps/admin-x-settings/src/admin-x-ds/experimental/Task.stories.tsx b/apps/admin-x-settings/src/admin-x-ds/experimental/Task.stories.tsx
deleted file mode 100644
index 3ad8e8ca455..00000000000
--- a/apps/admin-x-settings/src/admin-x-ds/experimental/Task.stories.tsx
+++ /dev/null
@@ -1,37 +0,0 @@
-import Task from './Task';
-
-const story = {
-    component: Task,
-    title: 'Experimental / Task',
-    tags: ['autodocs']
-};
-
-export default story;
-
-export const Default = {
-    args: {
-        task: {
-            id: '1',
-            title: 'Test task',
-            state: 'TASK_INBOX'
-        }
-    }
-};
-
-export const Pinned = {
-    args: {
-        task: {
-            ...Default.args.task,
-            state: 'TASK_PINNED'
-        }
-    }
-};
-
-export const Archived = {
-    args: {
-        task: {
-            ...Default.args.task,
-            state: 'TASK_ARCHIVED'
-        }
-    }
-};
\ No newline at end of file
diff --git a/apps/admin-x-settings/src/admin-x-ds/experimental/Task.tsx b/apps/admin-x-settings/src/admin-x-ds/experimental/Task.tsx
deleted file mode 100644
index 9960ad4aa1d..00000000000
--- a/apps/admin-x-settings/src/admin-x-ds/experimental/Task.tsx
+++ /dev/null
@@ -1,64 +0,0 @@
-import React from 'react';
-
-interface Props {
-    task: {
-        id: string,
-        title: string,
-        state: string,
-    }
-    onArchiveTask: (id: string) => void,
-    onPinTask: (id: string) => void,
-}
-
-const Task: React.FC<Props> = ({task: {id, title, state}, onArchiveTask, onPinTask}) => {
-    return (
-        <div className={`list-item ${state}`}>
-            <label
-                aria-label={title}
-                className="checkbox"
-                htmlFor="title"
-            >
-                <input
-                    checked={state === 'TASK_ARCHIVED'}
-                    disabled={true}
-                    id={`archiveTask-${id}`}
-                    name="checked"
-                    type="checkbox"
-                />
-                <span
-                    className="checkbox-custom"
-                    onClick={() => onArchiveTask(id)}
-                />
-            </label>
-
-            <label
-                aria-label={title}
-                className="title"
-                htmlFor="title"
-            >
-                <input
-                    name="title"
-                    placeholder="Input title"
-                    readOnly={true}
-                    type="text"
-                    value={title}
-                />
-            </label>
-
-            {state !== 'TASK_ARCHIVED' && (
-                <button
-                    key={`pinTask-${id}`}
-                    aria-label={`pinTask-${id}`}
-                    className="pin-button"
-                    id={`pinTask-${id}`}
-                    type="button"
-                    onClick={() => onPinTask(id)}
-                >
-                    <span className={`icon-star`} />
-                </button>
-            )}
-        </div>
-    );
-};
-
-export default Task;
\ No newline at end of file
diff --git a/apps/admin-x-settings/src/admin-x-ds/experimental/Tasklist.stories.tsx b/apps/admin-x-settings/src/admin-x-ds/experimental/Tasklist.stories.tsx
deleted file mode 100644
index e07cb3ed48b..00000000000
--- a/apps/admin-x-settings/src/admin-x-ds/experimental/Tasklist.stories.tsx
+++ /dev/null
@@ -1,47 +0,0 @@
-import TaskList from './Tasklist';
-import {ReactNode} from 'react';
-
-import * as TaskStories from './Task.stories';
-
-const story = {
-    component: TaskList,
-    title: 'Experimental / Task List',
-    decorators: [(_story: () => ReactNode) => <div style={{padding: '3rem'}}>{_story()}</div>],
-    tags: ['autodocs']
-};
-
-export default story;
-
-export const Default = {
-    args: {
-        tasks: [
-            {...TaskStories.Default.args.task, id: '1', title: 'Task 1'},
-            {...TaskStories.Default.args.task, id: '2', title: 'Task 2'},
-            {...TaskStories.Default.args.task, id: '3', title: 'Task 3'},
-            {...TaskStories.Default.args.task, id: '4', title: 'Task 4'}
-        ]
-    }
-};
-
-export const WithPinnedTasks = {
-    args: {
-        tasks: [
-            ...Default.args.tasks.slice(0, 3),
-            {id: '6', title: 'Task 6 (pinned)', state: 'TASK_PINNED'}
-        ]
-    }
-};
-
-export const Loading = {
-    args: {
-        tasks: [],
-        loading: true
-    }
-};
-
-export const Empty = {
-    args: {
-        ...Loading.args,
-        loading: false
-    }
-};
diff --git a/apps/admin-x-settings/src/admin-x-ds/experimental/Tasklist.tsx b/apps/admin-x-settings/src/admin-x-ds/experimental/Tasklist.tsx
deleted file mode 100644
index 3bbae3876a7..00000000000
--- a/apps/admin-x-settings/src/admin-x-ds/experimental/Tasklist.tsx
+++ /dev/null
@@ -1,38 +0,0 @@
-import React from 'react';
-import Task from './Task';
-
-interface Props {
-    loading: boolean,
-    tasks: Array<{
-        id: string, 
-        title: string,
-        state: string,
-    }>,
-    onArchiveTask: (id: string) => void,
-    onPinTask: (id: string) => void,
-}
-
-const TaskList: React.FC<Props> = ({loading, tasks, onPinTask, onArchiveTask}) => {
-    const events = {
-        onPinTask,
-        onArchiveTask
-    };
-
-    if (loading) {
-        return <div>Loading</div>;
-    }
-
-    if (tasks.length === 0) {
-        return <div>empty</div>;
-    }
-
-    return (
-        <div>
-            {tasks.map(task => (
-                <Task key={task.id} task={task} {...events} />
-            ))}
-        </div>
-    );
-};
-
-export default TaskList;
\ No newline at end of file
diff --git a/apps/admin-x-settings/src/admin-x-ds/experimental/assets/code-brackets.svg b/apps/admin-x-settings/src/admin-x-ds/experimental/assets/code-brackets.svg
deleted file mode 100644
index 73de9477600..00000000000
--- a/apps/admin-x-settings/src/admin-x-ds/experimental/assets/code-brackets.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="48" height="48" version="1.1" viewBox="0 0 48 48"><title>illustration/code-brackets</title><g id="illustration/code-brackets" fill="none" fill-rule="evenodd" stroke="none" stroke-width="1"><path id="Combined-Shape" fill="#87E6E5" d="M11.4139325,12 C11.7605938,12 12,12.5059743 12,13.3779712 L12,17.4951758 L6.43502246,23.3839989 C5.85499251,23.9978337 5.85499251,25.0021663 6.43502246,25.6160011 L12,31.5048242 L12,35.6220288 C12,36.4939606 11.7605228,37 11.4139325,37 C11.2725831,37 11.1134406,36.9158987 10.9453839,36.7379973 L0.435022463,25.6160011 C-0.145007488,25.0021663 -0.145007488,23.9978337 0.435022463,23.3839989 L10.9453839,12.2620027 C11.1134051,12.0841663 11.2725831,12 11.4139325,12 Z M36.5860675,12 C36.7274169,12 36.8865594,12.0841013 37.0546161,12.2620027 L47.5649775,23.3839989 C48.1450075,23.9978337 48.1450075,25.0021663 47.5649775,25.6160011 L37.0546161,36.7379973 C36.8865949,36.9158337 36.7274169,37 36.5860675,37 C36.2394062,37 36,36.4940257 36,35.6220288 L36,31.5048242 L41.5649775,25.6160011 C42.1450075,25.0021663 42.1450075,23.9978337 41.5649775,23.3839989 L36,17.4951758 L36,13.3779712 C36,12.5060394 36.2394772,12 36.5860675,12 Z"/><rect id="Rectangle-7-Copy-5" width="35.57" height="4" x="5.009" y="22.662" fill="#A0DB77" rx="2" transform="translate(22.793959, 24.662305) rotate(-75.000000) translate(-22.793959, -24.662305)"/></g></svg>
\ No newline at end of file
diff --git a/apps/admin-x-settings/src/admin-x-ds/experimental/assets/colors.svg b/apps/admin-x-settings/src/admin-x-ds/experimental/assets/colors.svg
deleted file mode 100644
index 17d58d516e1..00000000000
--- a/apps/admin-x-settings/src/admin-x-ds/experimental/assets/colors.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="48" height="48" version="1.1" viewBox="0 0 48 48"><title>illustration/colors</title><g id="illustration/colors" fill="none" fill-rule="evenodd" stroke="none" stroke-width="1"><circle id="Oval" cx="23.763" cy="16.192" r="13.271" fill="#FC521F" opacity=".6"/><circle id="Oval-Copy" cx="15.468" cy="32.308" r="13.271" fill="#66BF3C" opacity=".6"/><path id="Combined-Shape" fill="#FF5F95" d="M15.4683651,19.0362231 C21.5434817,19.0362231 26.6652087,23.1181689 28.2404554,28.6889694 C26.8420385,29.1906678 25.3344184,29.4637769 23.7630101,29.4637769 C17.6878936,29.4637769 12.5661666,25.3818311 10.9909199,19.8110306 C12.3898993,19.3092302 13.8972501,19.0362231 15.4683651,19.0362231 Z"/><circle id="Oval-Copy-2" cx="32.532" cy="32.308" r="13.271" fill="#1EA7FD" opacity=".6"/><path id="Combined-Shape" fill="#87E6E5" d="M24.00025,22.1417324 C26.897967,24.5762286 28.7397972,28.2268506 28.7397972,32.3076552 C28.7397972,36.3884597 26.897967,40.0390817 24.00025,42.4735779 C21.1018087,40.038637 19.2602028,36.3882111 19.2602028,32.3076552 C19.2602028,28.2815316 21.0530043,24.6741393 23.8838362,22.2402492 Z"/><path id="Combined-Shape" fill="#FBD178" d="M32.5316349,19.0362231 C33.9415155,19.0362231 35.3000478,19.2560712 36.5748203,19.6633557 C35.0489179,25.3104816 29.8909911,29.4637769 23.7630101,29.4637769 C22.3527608,29.4637769 20.9938866,29.2438138 19.7188247,28.8363247 C21.2451195,23.1900077 26.403293,19.0362231 32.5316349,19.0362231 Z"/><path id="Combined-Shape" fill="#FFF" d="M24.00025,22.1417324 L24.0124326,22.1519799 C24.1747744,22.288701 24.3337918,22.4292434 24.4893463,22.5734686 L24.3896855,22.4820008 C24.4671836,22.552408 24.5438453,22.6237194 24.619654,22.6959185 L24.4893463,22.5734686 C24.5690639,22.6473803 24.6478719,22.7222591 24.7257519,22.7980864 L24.619654,22.6959185 C24.6907654,22.7636441 24.7611262,22.8321506 24.8307226,22.9014245 L24.7257519,22.7980864 C24.8120661,22.8821258 24.8972403,22.9673303 24.981249,23.0536745 L24.8307226,22.9014245 C24.9073006,22.9776475 24.9829531,23.0547994 25.0576619,23.132862 L25.057852,23.1330605 C25.3140855,23.4007967 25.559391,23.679459 25.7928375,23.9681079 L25.7230574,23.8825538 C25.7985998,23.9743942 25.8729325,24.0672672 25.9460311,24.1611484 L25.7928375,23.9681079 C25.8624256,24.0541514 25.93096,24.1410823 25.998421,24.228881 L25.9460311,24.1611484 C26.0074362,24.2400115 26.0679704,24.319586 26.1276194,24.3998576 L25.998421,24.228881 C26.0663495,24.317288 26.1331896,24.4065749 26.1989214,24.4967216 L26.1276194,24.3998576 C26.204848,24.5037867 26.2805926,24.6088841 26.3548219,24.7151187 L26.1989214,24.4967216 C26.2678555,24.59126 26.3355706,24.6867441 26.4020436,24.7831507 L26.3548219,24.7151187 C26.4130013,24.798383 26.4702498,24.8823459 26.5265523,24.9669921 L26.4020436,24.7831507 C26.4678788,24.8786322 26.5324956,24.9750187 26.5958716,25.0722875 L26.5959296,25.0723765 C26.736338,25.2878741 26.870709,25.5077955 26.9987399,25.7318073 L26.9410662,25.6319089 C26.9973106,25.7283602 27.0523736,25.8255849 27.1062352,25.9235633 L26.9987399,25.7318073 C27.0539848,25.8284676 27.1080492,25.9258895 27.1609136,26.0240532 L27.1606656,26.0235927 C27.2696676,26.2259984 27.3733426,26.4310837 27.4717677,26.6391379 L27.4715275,26.6386302 C27.5541941,26.8133735 27.6329386,26.9896914 27.7079006,27.1679911 C27.7630163,27.299081 27.8161443,27.431391 27.8671831,27.5647345 L27.804312,27.4036517 C27.8391482,27.4912057 27.8730792,27.5792182 27.9060936,27.6676774 L27.8671831,27.5647345 C27.906613,27.6677486 27.9447959,27.7713796 27.9817136,27.8756091 L27.9060936,27.6676774 C27.946474,27.7758735 27.9854831,27.884738 28.0230997,27.9942498 L27.9817136,27.8756091 C28.0144978,27.9681688 28.0462842,28.0612004 28.0770597,28.1546911 L28.0230997,27.9942498 C28.0618265,28.1069941 28.0990774,28.2204244 28.1348294,28.3345177 L28.0770597,28.1546911 C28.1112208,28.2584663 28.1441365,28.3628071 28.175789,28.4676958 L28.1756797,28.4673338 L28.2408136,28.6893554 C28.2284694,28.6937793 28.2161167,28.6981854 28.2037557,28.7025737 L28.2404554,28.6889694 C27.9517707,28.7925384 27.6584322,28.8863659 27.3608394,28.97006 L27.3609965,28.9702524 C27.0695498,29.0519815 26.7741843,29.1241944 26.4751174,29.1863314 L26.5385665,29.1730829 C26.3901218,29.2046704 26.2407589,29.2337757 26.0905233,29.2603535 L26.4751174,29.1863314 C26.3367402,29.215082 26.1975707,29.2416755 26.0576458,29.2660754 L26.0905233,29.2603535 C25.9366833,29.2875689 25.7819282,29.312134 25.6263069,29.334 L26.0576458,29.2660754 C25.9017815,29.2932549 25.7449801,29.3177127 25.5872928,29.3393985 L25.6263069,29.334 C25.493366,29.3526793 25.3597929,29.3693888 25.2256182,29.3840982 L25.5872928,29.3393985 C25.4326976,29.360659 25.277251,29.3792552 25.1210012,29.3951396 L25.2256182,29.3840982 C25.0570566,29.4025774 24.8875455,29.4178998 24.7171453,29.4300052 L25.1210012,29.3951396 C24.9661341,29.4108835 24.810478,29.4239634 24.6540799,29.4343333 L24.7171453,29.4300052 C24.5612618,29.4410793 24.4046342,29.4494611 24.2473088,29.4551045 L24.6540799,29.4343333 C24.5098436,29.4438967 24.3649762,29.4511552 24.2195147,29.4560724 L24.2473088,29.4551045 C24.0865878,29.4608697 23.9251385,29.4637769 23.7630101,29.4637769 L23.3130142,29.4562912 C23.2993121,29.4558347 23.2856153,29.4553574 23.2719237,29.4548593 C22.9596275,29.4434959 22.6502324,29.4213577 22.3439491,29.3888006 L22.3886972,29.3934808 C22.2468147,29.3788837 22.105595,29.3620515 21.9650736,29.3430199 L22.3439491,29.3888006 C22.1914515,29.3725905 22.0397254,29.3537976 21.8888152,29.3324664 L21.9650736,29.3430199 C21.8025527,29.3210088 21.6409661,29.2960557 21.4803691,29.2682161 L21.8888152,29.3324664 C21.7352182,29.3107553 21.5824665,29.2864149 21.4306071,29.2594919 L21.4803691,29.2682161 C21.3506285,29.2457255 21.2215338,29.221351 21.0931142,29.1951218 L21.4306071,29.2594919 C21.2772401,29.2323016 21.1247833,29.2024774 20.973285,29.1700676 L21.0931142,29.1951218 C20.9267071,29.1611338 20.7614335,29.1240315 20.5973571,29.0838786 L20.973285,29.1700676 C20.825476,29.138447 20.6785795,29.1043653 20.5326403,29.0678674 L20.5973571,29.0838786 C20.4596684,29.0501832 20.3228227,29.0143396 20.1868576,28.9763851 L20.5326403,29.0678674 C20.3930822,29.0329653 20.2543997,28.9958536 20.1166319,28.9565718 L20.1169729,28.956669 L19.7188247,28.8363247 L19.7188247,28.8363247 L19.7880988,28.5894836 C19.8166627,28.4914193 19.8463277,28.3938241 19.8770797,28.2967124 L19.8480041,28.389868 C19.888904,28.2573207 19.931824,28.1256601 19.9767281,27.9949221 L19.8770797,28.2967124 C19.9117081,28.1873592 19.9477148,28.0786191 19.9850793,27.9705124 L19.9853117,27.9700125 C20.1152243,27.5939638 20.2618428,27.2250995 20.4240731,26.8647811 L20.345088,27.0439391 C20.3899401,26.9402428 20.4360767,26.8372321 20.4834778,26.7349269 L20.4240731,26.8647811 C20.461061,26.78263 20.4988604,26.7009231 20.5374612,26.6196707 L20.4834778,26.7349269 C20.5344734,26.6248636 20.5869326,26.515617 20.6408302,26.4072119 L20.5374612,26.6196707 C20.5871241,26.5151329 20.6381134,26.4113474 20.6904074,26.308336 L20.6408302,26.4072119 C20.681671,26.3250682 20.7233378,26.2434076 20.7658197,26.1622412 L20.7658807,26.1619302 C20.8435258,26.013775 20.923959,25.866962 21.0070529,25.7218685 C21.2050227,25.3759931 21.4182299,25.0398756 21.6456589,24.7144306 L21.5286537,24.8848257 C21.5876708,24.7975143 21.6476996,24.7109431 21.7087233,24.6251289 L21.6456589,24.7144306 C21.6993229,24.6376387 21.7537788,24.5614411 21.8090146,24.4858495 L21.7087233,24.6251289 C21.7826333,24.5211934 21.8580028,24.4183683 21.9348018,24.3166836 L21.8090146,24.4858495 C21.8722751,24.3992759 21.9365587,24.3134973 22.0018475,24.2285315 L22.0016895,24.2288802 C22.3179789,23.8171232 22.6576794,23.4247699 23.0189296,23.053491 L22.8296293,23.2521975 C22.9033796,23.1732135 22.9780829,23.095131 23.0537208,23.0179683 L23.0189296,23.053491 C23.083529,22.9870982 23.1488175,22.9213793 23.2147836,22.8563459 L23.0537208,23.0179683 C23.131055,22.9390752 23.2093662,22.8611436 23.2886348,22.7841931 L23.2147836,22.8563459 C23.2821211,22.7899605 23.3501645,22.7242893 23.4189017,22.6593447 L23.2886348,22.7841931 C23.3852399,22.6904132 23.4832671,22.5980904 23.582681,22.5072602 L23.4189017,22.6593447 C23.4912637,22.5909753 23.5643945,22.523411 23.6382797,22.4566663 L23.582681,22.5072602 C23.6715916,22.4260264 23.7616113,22.3459865 23.8527148,22.2671658 L23.8525967,22.2671923 C23.8915062,22.2336043 23.9304941,22.2002638 23.9696766,22.1671464 L24.00025,22.1417324 Z"/></g></svg>
\ No newline at end of file
diff --git a/apps/admin-x-settings/src/admin-x-ds/experimental/assets/comments.svg b/apps/admin-x-settings/src/admin-x-ds/experimental/assets/comments.svg
deleted file mode 100644
index 6493a139f52..00000000000
--- a/apps/admin-x-settings/src/admin-x-ds/experimental/assets/comments.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="48" height="48" version="1.1" viewBox="0 0 48 48"><title>illustration/comments</title><g id="illustration/comments" fill="none" fill-rule="evenodd" stroke="none" stroke-width="1"><path id="Path" fill="#96D07C" d="M2.52730803,17.9196415 C2.44329744,17.9745167 2.36370847,18.000488 2.29303375,18.000488 C2.1197031,18.000488 2,17.8443588 2,17.5752855 L2,4 C2,1.790861 3.790861,3.23296945e-13 6,3.23296945e-13 L33.9995117,3.23296945e-13 C36.2086507,3.23296945e-13 37.9995117,1.790861 37.9995117,4 L37.9995117,9.999512 C37.9995117,12.208651 36.2086507,13.999512 33.9995117,13.999512 L8,13.999512 C7.83499225,13.999512 7.6723181,13.9895206 7.51254954,13.9701099 L2.52730803,17.9196415 Z"/><path id="Path" fill="#73E1E0" d="M7.51066,44.9703679 L2.52730803,47.9186655 C2.44329744,47.9735407 2.36370847,47.999512 2.29303375,47.999512 C2.1197031,47.999512 2,47.8433828 2,47.5743095 L2,35 C2,32.790861 3.790861,31 6,31 L26,31 C28.209139,31 30,32.790861 30,35 L30,41 C30,43.209139 28.209139,45 26,45 L8,45 C7.8343417,45 7.67103544,44.9899297 7.51066,44.9703679 Z"/><path id="Path" fill="#FFD476" d="M46,19.5 L46,33.0747975 C46,33.3438708 45.8802969,33.5 45.7069663,33.5 C45.6362915,33.5 45.5567026,33.4740287 45.472692,33.4191535 L40.4887103,29.4704446 C40.3285371,29.489956 40.1654415,29.5 40,29.5 L18,29.5 C15.790861,29.5 14,27.709139 14,25.5 L14,19.5 C14,17.290861 15.790861,15.5 18,15.5 L42,15.5 C44.209139,15.5 46,17.290861 46,19.5 Z"/></g></svg>
\ No newline at end of file
diff --git a/apps/admin-x-settings/src/admin-x-ds/experimental/assets/direction.svg b/apps/admin-x-settings/src/admin-x-ds/experimental/assets/direction.svg
deleted file mode 100644
index 65676ac2722..00000000000
--- a/apps/admin-x-settings/src/admin-x-ds/experimental/assets/direction.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="48" height="48" version="1.1" viewBox="0 0 48 48"><title>illustration/direction</title><g id="illustration/direction" fill="none" fill-rule="evenodd" stroke="none" stroke-width="1"><path id="Combined-Shape" fill="#FFD476" d="M23.4917015,33.6030641 L2.93840258,31.4321033 C2.38917316,31.3740904 1.99096346,30.8818233 2.04897631,30.3325939 C2.0747515,30.0885705 2.18934861,29.8625419 2.37095722,29.6975265 L34.2609105,0.721285325 C34.6696614,0.349881049 35.3021022,0.38015648 35.6735064,0.788907393 C35.9232621,1.06377731 36.0001133,1.45442096 35.8730901,1.80341447 L24.5364357,32.9506164 C24.3793473,33.3822133 23.9484565,33.6513092 23.4917015,33.6030641 L23.4917015,33.6030641 Z"/><path id="Combined-Shape-Copy" fill="#FFC445" d="M24.3163597,33.2881029 C24.0306575,33.0138462 23.9337246,32.5968232 24.069176,32.2246735 L35.091923,1.9399251 C35.2266075,1.56988243 35.5659249,1.31333613 35.9586669,1.28460955 C36.5094802,1.24432106 36.9886628,1.65818318 37.0289513,2.20899647 L40.2437557,46.1609256 C40.2644355,46.4436546 40.1641446,46.7218752 39.9678293,46.9263833 C39.5853672,47.3248067 38.9523344,47.3377458 38.5539111,46.9552837 L24.3163597,33.2881029 L24.3163597,33.2881029 Z"/></g></svg>
\ No newline at end of file
diff --git a/apps/admin-x-settings/src/admin-x-ds/experimental/assets/flow.svg b/apps/admin-x-settings/src/admin-x-ds/experimental/assets/flow.svg
deleted file mode 100644
index 8ac27db403c..00000000000
--- a/apps/admin-x-settings/src/admin-x-ds/experimental/assets/flow.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="48" height="48" version="1.1" viewBox="0 0 48 48"><title>illustration/flow</title><g id="illustration/flow" fill="none" fill-rule="evenodd" stroke="none" stroke-width="1"><path id="Combined-Shape" fill="#79C9FC" fill-rule="nonzero" d="M30,29 C32.7614237,29 35,26.7614237 35,24 C35,14.6111593 27.3888407,7 18,7 C8.61115925,7 1,14.6111593 1,24 C1,33.3888407 8.61115925,41 18,41 C19.3333404,41 20.6447683,40.8466238 21.9154603,40.5471706 C19.5096374,39.3319645 17.5510566,37.8612875 16.0456579,36.1314815 C14.1063138,33.9030427 12.769443,31.0725999 12.0293806,27.6556449 C11.360469,26.565281 11,25.3082308 11,24 C11,20.1340068 14.1340068,17 18,17 C21.8659932,17 25,20.1340068 25,24 C25,26.125 27.7040312,29 30,29 Z"/><path id="Combined-Shape-Copy" fill="#FFC445" fill-rule="nonzero" d="M42,29 C44.7614237,29 47,26.7614237 47,24 C47,14.6111593 39.3888407,7 30,7 C20.6111593,7 13,14.6111593 13,24 C13,33.3888407 20.6111593,41 30,41 C31.3333404,41 32.6447683,40.8466238 33.9154603,40.5471706 C31.5096374,39.3319645 29.4051056,37.9781963 28.0456579,36.1314815 C26.0625,33.4375 23,27.1875 23,24 C23,20.1340068 26.1340068,17 30,17 C33.8659932,17 37,20.1340068 37,24 C37.02301,26.3435241 39.7040312,29 42,29 Z" transform="translate(30.000000, 24.000000) scale(-1, -1) translate(-30.000000, -24.000000)"/></g></svg>
\ No newline at end of file
diff --git a/apps/admin-x-settings/src/admin-x-ds/experimental/assets/plugin.svg b/apps/admin-x-settings/src/admin-x-ds/experimental/assets/plugin.svg
deleted file mode 100644
index 29e5c690c0a..00000000000
--- a/apps/admin-x-settings/src/admin-x-ds/experimental/assets/plugin.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="48" height="48" version="1.1" viewBox="0 0 48 48"><title>illustration/plugin</title><g id="illustration/plugin" fill="none" fill-rule="evenodd" stroke="none" stroke-width="1"><path id="Combined-Shape" fill="#79C9FC" d="M26,15.3994248 C26,15.4091303 26,15.4188459 26,15.4285714 L26,21.4694881 C25.8463595,21.4969567 25.6941676,21.51275 25.5873784,21.51275 C25.4974117,21.51275 25.4230979,21.4768034 25.377756,21.4206259 L25.2660784,21.2822603 L25.1317423,21.1657666 C24.2436317,20.3956144 23.100098,19.9633214 21.895551,19.9633214 C19.2039137,19.9633214 17,22.1075558 17,24.7804643 C17,27.4533728 19.2039137,29.5976071 21.895551,29.5976071 C23.1972122,29.5976071 24.3149423,29.2878193 25.1231445,28.3613697 C25.4542273,27.9818463 25.568273,27.9073214 25.5873784,27.9073214 C25.681532,27.9073214 25.8352452,27.9239643 26,27.9524591 L26,32.5714286 C26,32.5811541 26,32.5908697 26,32.6005752 L26,33 C26,35.209139 24.209139,37 22,37 L4,37 C1.790861,37 0,35.209139 0,33 L0,15 C0,12.790861 1.790861,11 4,11 L22,11 C24.209139,11 26,12.790861 26,15 L26,15.3994248 Z"/><path id="Path" fill="#87E6E5" d="M27.9998779,32.5714286 C27.9998779,33.3604068 28.6572726,34 29.4682101,34 L46.5315458,34 C47.3424832,34 47.9998779,33.3604068 47.9998779,32.5714286 L47.9998779,15.4285714 C47.9998779,14.6395932 47.3424832,14 46.5315458,14 L29.4682101,14 C28.6572726,14 27.9998779,14.6395932 27.9998779,15.4285714 L27.9998779,21.8355216 C27.9334367,22.2650514 27.8567585,22.6454496 27.746391,22.8084643 C27.4245309,23.2838571 26.2402709,23.51275 25.5873784,23.51275 C24.8705773,23.51275 24.2322714,23.1857725 23.8214379,22.6767605 C23.3096996,22.2329909 22.6349941,21.9633214 21.895551,21.9633214 C20.2963823,21.9633214 19,23.2245992 19,24.7804643 C19,26.3363293 20.2963823,27.5976071 21.895551,27.5976071 C22.5398535,27.5976071 23.2399343,27.477727 23.6160247,27.0466112 C24.1396029,26.4464286 24.7367044,25.9073214 25.5873784,25.9073214 C26.2402709,25.9073214 27.5912951,26.1766031 27.8226692,26.6116071 C27.8819199,26.7230038 27.9403239,26.921677 27.9998779,27.1556219 L27.9998779,32.5714286 Z"/></g></svg>
\ No newline at end of file
diff --git a/apps/admin-x-settings/src/admin-x-ds/experimental/assets/repo.svg b/apps/admin-x-settings/src/admin-x-ds/experimental/assets/repo.svg
deleted file mode 100644
index f386ee902c1..00000000000
--- a/apps/admin-x-settings/src/admin-x-ds/experimental/assets/repo.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="48" height="48" version="1.1" viewBox="0 0 48 48"><title>illustration/repo</title><g id="illustration/repo" fill="none" fill-rule="evenodd" stroke="none" stroke-width="1"><path id="Rectangle-62-Copy" fill="#B7F0EF" d="M27.2217723,9.04506931 L41.2217723,6.2682098 C43.3886973,5.83840648 45.4937616,7.2466219 45.9235649,9.41354696 C45.9743993,9.66983721 46,9.93049166 46,10.1917747 L46,32.581381 C46,34.4904961 44.650862,36.1335143 42.7782277,36.5049459 L28.7782277,39.2818054 C26.6113027,39.7116087 24.5062384,38.3033933 24.0764351,36.1364682 C24.0256007,35.880178 24,35.6195235 24,35.3582405 L24,12.9686342 C24,11.0595191 25.349138,9.4165009 27.2217723,9.04506931 Z" opacity=".7"/><path id="Combined-Shape" fill="#87E6E5" d="M6.77822775,6.2682098 L20.7782277,9.04506931 C22.650862,9.4165009 24,11.0595191 24,12.9686342 L24,35.3582405 C24,37.5673795 22.209139,39.3582405 20,39.3582405 C19.738717,39.3582405 19.4780625,39.3326398 19.2217723,39.2818054 L5.22177225,36.5049459 C3.34913798,36.1335143 2,34.4904961 2,32.581381 L2,10.1917747 C2,7.98263571 3.790861,6.19177471 6,6.19177471 C6.26128305,6.19177471 6.5219375,6.21737537 6.77822775,6.2682098 Z"/><path id="Rectangle-63-Copy-2" fill="#61C1FD" d="M22,10 C23.1666667,10.2291667 24.0179036,10.625 24.5537109,11.1875 C25.0895182,11.75 25.5716146,12.875 26,14.5625 C26,29.3020833 26,37.5208333 26,39.21875 C26,40.9166667 26.4241536,42.9583333 27.2724609,45.34375 L24.5537109,41.875 L22.9824219,45.34375 C22.327474,43.1979167 22,41.2291667 22,39.4375 C22,37.6458333 22,27.8333333 22,10 Z"/></g></svg>
\ No newline at end of file
diff --git a/apps/admin-x-settings/src/admin-x-ds/experimental/assets/stackalt.svg b/apps/admin-x-settings/src/admin-x-ds/experimental/assets/stackalt.svg
deleted file mode 100644
index 9b7ad274350..00000000000
--- a/apps/admin-x-settings/src/admin-x-ds/experimental/assets/stackalt.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="48" height="48" version="1.1" viewBox="0 0 48 48"><title>illustration/stackalt</title><g id="illustration/stackalt" fill="none" fill-rule="evenodd" stroke="none" stroke-width="1"><path id="Combined-Shape" fill="#FFAE00" d="M23.8628277,0 L23.8628277,48 L3.32291648,36.2491883 L3.32155653,11.9499781 L23.8628277,0 Z M23.8670509,0 L44.408322,11.9499781 L44.4069621,36.2491883 L23.8670509,48 L23.8670509,0 Z" opacity=".196"/><path id="Rectangle-46-Copy-3" fill="#66BF3C" d="M15.8232279,19.1155258 L24.7368455,21.4714881 C29.6053842,22.7582937 33.4077423,26.5606518 34.694548,31.4291905 L37.0505103,40.3428082 C37.6150232,42.4786032 36.3412474,44.6676353 34.2054524,45.2321482 C33.5569474,45.4035549 32.87575,45.4091235 32.2245294,45.2483418 L23.3459013,43.0562718 C18.2976962,41.809906 14.3561301,37.8683399 13.1097642,32.8201348 L10.9176943,23.9415066 C10.3881737,21.7967682 11.6975664,19.6288529 13.8423049,19.0993322 C14.4935255,18.9385505 15.1747229,18.9441191 15.8232279,19.1155258 Z" opacity=".5" transform="translate(23.999997, 32.166058) rotate(-45.000000) translate(-23.999997, -32.166058)"/><path id="Rectangle-46-Copy-2" fill="#FFAE00" d="M15.8232279,11.2216893 L24.7368455,13.5776516 C29.6053842,14.8644572 33.4077423,18.6668153 34.694548,23.5353541 L37.0505103,32.4489717 C37.6150232,34.5847667 36.3412474,36.7737988 34.2054524,37.3383117 C33.5569474,37.5097184 32.87575,37.515287 32.2245294,37.3545053 L23.3459013,35.1624353 C18.2976962,33.9160695 14.3561301,29.9745034 13.1097642,24.9262983 L10.9176943,16.0476701 C10.3881737,13.9029317 11.6975664,11.7350164 13.8423049,11.2054957 C14.4935255,11.044714 15.1747229,11.0502826 15.8232279,11.2216893 Z" opacity=".5" transform="translate(23.999997, 24.272222) rotate(-45.000000) translate(-23.999997, -24.272222)"/><path id="Rectangle-46-Copy" fill="#FC521F" d="M15.8232279,3.32785281 L24.7368455,5.68381509 C29.6053842,6.97062075 33.4077423,10.7729788 34.694548,15.6415176 L37.0505103,24.5551352 C37.6150232,26.6909302 36.3412474,28.8799623 34.2054524,29.4444752 C33.5569474,29.6158819 32.87575,29.6214505 32.2245294,29.4606688 L23.3459013,27.2685988 C18.2976962,26.022233 14.3561301,22.0806669 13.1097642,17.0324618 L10.9176943,8.15383364 C10.3881737,6.00909519 11.6975664,3.84117987 13.8423049,3.31165925 C14.4935255,3.15087753 15.1747229,3.15644615 15.8232279,3.32785281 Z" opacity=".5" transform="translate(23.999997, 16.378385) rotate(-45.000000) translate(-23.999997, -16.378385)"/></g></svg>
\ No newline at end of file
diff --git a/apps/admin-x-settings/src/admin-x-ds/experimental/button.css b/apps/admin-x-settings/src/admin-x-ds/experimental/button.css
deleted file mode 100644
index dc91dc76370..00000000000
--- a/apps/admin-x-settings/src/admin-x-ds/experimental/button.css
+++ /dev/null
@@ -1,30 +0,0 @@
-.storybook-button {
-  font-family: 'Nunito Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif;
-  font-weight: 700;
-  border: 0;
-  border-radius: 3em;
-  cursor: pointer;
-  display: inline-block;
-  line-height: 1;
-}
-.storybook-button--primary {
-  color: white;
-  background-color: #1ea7fd;
-}
-.storybook-button--secondary {
-  color: #333;
-  background-color: transparent;
-  box-shadow: rgba(0, 0, 0, 0.15) 0px 0px 0px 1px inset;
-}
-.storybook-button--small {
-  font-size: 12px;
-  padding: 10px 16px;
-}
-.storybook-button--medium {
-  font-size: 14px;
-  padding: 11px 20px;
-}
-.storybook-button--large {
-  font-size: 16px;
-  padding: 12px 24px;
-}
diff --git a/apps/admin-x-settings/src/admin-x-ds/experimental/header.css b/apps/admin-x-settings/src/admin-x-ds/experimental/header.css
deleted file mode 100644
index 9fb414e5040..00000000000
--- a/apps/admin-x-settings/src/admin-x-ds/experimental/header.css
+++ /dev/null
@@ -1,14 +0,0 @@
-.storybook-wrapper {
-  font-family: 'Nunito Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif;
-  border-bottom: 1px solid rgba(0, 0, 0, 0.1);
-  padding: 15px 20px;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-}
-
-.storybook-welcome {
-  color: #333;
-  font-size: 14px;
-  margin-right: 10px;
-}
diff --git a/apps/admin-x-settings/src/admin-x-ds/experimental/page.css b/apps/admin-x-settings/src/admin-x-ds/experimental/page.css
deleted file mode 100644
index fb64fe46294..00000000000
--- a/apps/admin-x-settings/src/admin-x-ds/experimental/page.css
+++ /dev/null
@@ -1,69 +0,0 @@
-section {
-  font-family: 'Nunito Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif;
-  font-size: 14px;
-  line-height: 24px;
-  padding: 48px 20px;
-  margin: 0 auto;
-  max-width: 600px;
-  color: #333;
-}
-
-section h2 {
-  font-weight: 700;
-  font-size: 32px;
-  line-height: 1;
-  margin: 0 0 4px;
-  display: inline-block;
-  vertical-align: top;
-}
-
-section p {
-  margin: 1em 0;
-}
-
-section a {
-  text-decoration: none;
-  color: #1ea7fd;
-}
-
-section ul {
-  padding-left: 30px;
-  margin: 1em 0;
-}
-
-section li {
-  margin-bottom: 8px;
-}
-
-section .tip {
-  display: inline-block;
-  border-radius: 1em;
-  font-size: 11px;
-  line-height: 12px;
-  font-weight: 700;
-  background: #e7fdd8;
-  color: #66bf3c;
-  padding: 4px 12px;
-  margin-right: 10px;
-  vertical-align: top;
-}
-
-section .tip-wrapper {
-  font-size: 13px;
-  line-height: 20px;
-  margin-top: 40px;
-  margin-bottom: 40px;
-}
-
-section .tip-wrapper svg {
-  display: inline-block;
-  height: 12px;
-  width: 12px;
-  margin-right: 4px;
-  vertical-align: top;
-  margin-top: 3px;
-}
-
-section .tip-wrapper svg path {
-  fill: #1ea7fd;
-}
diff --git a/apps/admin-x-settings/src/admin-x-ds/global/ToastContainer.tsx b/apps/admin-x-settings/src/admin-x-ds/global/ToastContainer.tsx
deleted file mode 100644
index 36166a8a8c2..00000000000
--- a/apps/admin-x-settings/src/admin-x-ds/global/ToastContainer.tsx
+++ /dev/null
@@ -1,15 +0,0 @@
-import Button from './Button';
-import React from 'react';
-import {ShowToastProps, showToast} from './Toast';
-
-const ToastContainer: React.FC<ShowToastProps> = ({...props}) => {
-    return (
-        <>
-            <Button color='black' label='Toast me!' onClick={() => {
-                showToast({...props});
-            }} />
-        </>
-    );
-};
-
-export default ToastContainer;
\ No newline at end of file
diff --git a/apps/admin-x-settings/src/admin-x-ds/global/modal/ConfirmationModalContainer.tsx b/apps/admin-x-settings/src/admin-x-ds/global/modal/ConfirmationModalContainer.tsx
deleted file mode 100644
index bb5536dde93..00000000000
--- a/apps/admin-x-settings/src/admin-x-ds/global/modal/ConfirmationModalContainer.tsx
+++ /dev/null
@@ -1,14 +0,0 @@
-import Button from '../Button';
-import ConfirmationModal, {ConfirmationModalProps} from './ConfirmationModal';
-import NiceModal from '@ebay/nice-modal-react';
-import React from 'react';
-
-const ConfirmationModalContainer: React.FC<ConfirmationModalProps> = ({...props}) => {
-    return (
-        <Button color='black' label='Open confirmation modal' onClick={() => {
-            NiceModal.show(ConfirmationModal, {...props});
-        }} />
-    );
-};
-
-export default ConfirmationModalContainer;
\ No newline at end of file
diff --git a/apps/admin-x-settings/src/admin-x-ds/global/modal/ModalContainer.tsx b/apps/admin-x-settings/src/admin-x-ds/global/modal/ModalContainer.tsx
deleted file mode 100644
index 57f7e71f604..00000000000
--- a/apps/admin-x-settings/src/admin-x-ds/global/modal/ModalContainer.tsx
+++ /dev/null
@@ -1,26 +0,0 @@
-import NiceModal from '@ebay/nice-modal-react';
-import React from 'react';
-
-import Button from '../Button';
-import Modal, {ModalProps} from './Modal';
-
-const ModalContainer: React.FC<ModalProps> = ({children, ...props}) => {
-    const modal = NiceModal.create<ModalProps>(() => {
-        return (
-            <Modal {...props}>
-                <div className='py-4'>
-                    {children}
-                </div>
-            </Modal>
-        );
-    });
-    return (
-        <div>
-            <Button color='black' label='Open modal' onClick={() => {
-                NiceModal.show(modal);
-            }} />
-        </div>
-    );
-};
-
-export default ModalContainer;
diff --git a/apps/admin-x-settings/src/admin-x-ds/global/modal/PreviewModalContainer.tsx b/apps/admin-x-settings/src/admin-x-ds/global/modal/PreviewModalContainer.tsx
deleted file mode 100644
index 287e0b4cbe5..00000000000
--- a/apps/admin-x-settings/src/admin-x-ds/global/modal/PreviewModalContainer.tsx
+++ /dev/null
@@ -1,14 +0,0 @@
-import Button from '../Button';
-import NiceModal from '@ebay/nice-modal-react';
-import PreviewModal, {PreviewModalProps} from './PreviewModal';
-import React from 'react';
-
-const PreviewModalContainer: React.FC<PreviewModalProps> = ({...props}) => {
-    return (
-        <Button color='black' label='Open preview modal' onClick={() => {
-            NiceModal.show(PreviewModal, {...props});
-        }} />
-    );
-};
-
-export default PreviewModalContainer;
\ No newline at end of file
diff --git a/apps/admin-x-settings/src/api/external-ghost-site.ts b/apps/admin-x-settings/src/api/external-ghost-site.ts
deleted file mode 100644
index b6465eab84f..00000000000
--- a/apps/admin-x-settings/src/api/external-ghost-site.ts
+++ /dev/null
@@ -1,107 +0,0 @@
-import {useFetchApi} from '../utils/api/hooks';
-
-export type GhostSiteResponse = {
-    site: {
-        title: string,
-        description: string | null,
-        logo: URL | null,
-        icon: URL | null,
-        cover_image : URL | null,
-        allow_external_signup: boolean,
-        url: URL,
-    }
-}
-
-export const apiUrl = (root: string, path: string, searchParams: Record<string, string> = {}) => {
-    const url = new URL(`${root}${path}`, window.location.origin);
-    url.search = new URLSearchParams(searchParams).toString();
-    return url.toString();
-};
-
-export const useExternalGhostSite = () => {
-    const fetchApi = useFetchApi();
-    const path = '/members/api/site';
-
-    return {
-        async query(root: string) {
-            // Remove trailing slash
-            root = root.replace(/\/$/, '');
-            const url = apiUrl(root, path);
-            try {
-                const result = await fetchApi(url, {
-                    method: 'GET',
-                    credentials: 'omit', // Allow CORS wildcard,
-                    timeout: 5000,
-                    retry: false
-                });
-
-                // We need to validate all data types here for extra safety
-                if (typeof result !== 'object' || !result.site || typeof result.site !== 'object') {
-                    // eslint-disable-next-line no-console
-                    console.warn('Received invalid response from external Ghost site API', result);
-                    return null;
-                }
-
-                // Temporary mapping (should get removed!)
-                // allow_self_signup was replaced by allow_external_signup
-                if (typeof result.site.allow_self_signup === 'boolean' && typeof result.site.allow_external_signup !== 'boolean') {
-                    result.site.allow_external_signup = result.site.allow_self_signup;
-                }
-
-                // We need to validate all data types here for extra safety
-                if (typeof result.site.title !== 'string' || typeof result.site.allow_external_signup !== 'boolean' || typeof result.site.url !== 'string') {
-                    // eslint-disable-next-line no-console
-                    console.warn('Received invalid response from external Ghost site API', result);
-                    return null;
-                }
-
-                if (result.site.description !== null && typeof result.site.description !== 'string') {
-                    // eslint-disable-next-line no-console
-                    console.warn('Received invalid response from external Ghost site API', result);
-                    return null;
-                }
-
-                if (result.site.logo !== null && typeof result.site.logo !== 'string') {
-                    // eslint-disable-next-line no-console
-                    console.warn('Received invalid response from external Ghost site API', result);
-                    return null;
-                }
-
-                if (result.site.icon !== null && typeof result.site.icon !== 'string') {
-                    // eslint-disable-next-line no-console
-                    console.warn('Received invalid response from external Ghost site API', result);
-                    return null;
-                }
-
-                if (result.site.cover_image !== null && typeof result.site.cover_image !== 'string') {
-                    // eslint-disable-next-line no-console
-                    console.warn('Received invalid response from external Ghost site API', result);
-                    return null;
-                }
-
-                // Validate URLs
-                try {
-                    return {
-                        site: {
-                            title: result.site.title,
-                            description: result.site.description,
-                            logo: result.site.logo ? new URL(result.site.logo) : null,
-                            icon: result.site.icon ? new URL(result.site.icon) : null,
-                            cover_image: result.site.cover_image ? new URL(result.site.cover_image) : null,
-                            allow_external_signup: result.site.allow_external_signup,
-                            url: new URL(result.site.url)
-                        }
-                    };
-                } catch (e) {
-                    // eslint-disable-next-line no-console
-                    console.warn('Received invalid response from external Ghost site API', result, e);
-                    return null;
-                }
-            } catch (e) {
-                // eslint-disable-next-line no-console
-                console.error(e);
-                return null;
-            }
-        }
-    };
-};
diff --git a/apps/admin-x-settings/src/api/oembed.ts b/apps/admin-x-settings/src/api/oembed.ts
deleted file mode 100644
index 19a9954cb06..00000000000
--- a/apps/admin-x-settings/src/api/oembed.ts
+++ /dev/null
@@ -1,39 +0,0 @@
-import {apiUrl, useFetchApi} from '../utils/api/hooks';
-
-export type OembedResponse = {
-    metadata: {
-        title: string | null,
-        description:string | null,
-        author: string | null,
-        publisher: string | null,
-        thumbnail: string | null,
-        icon: string | null
-    }
-}
-
-export type OembedRequest = {
-    url: string,
-    type: 'mention'
-}
-
-export const useGetOembed = () => {
-    const fetchApi = useFetchApi();
-    const path = '/oembed/';
-
-    return {
-        async query(searchParams: OembedRequest) {
-            const url = apiUrl(path, searchParams);
-            try {
-                const result = await fetchApi(url, {
-                    method: 'GET',
-                    timeout: 5000
-                });
-                return result as OembedResponse;
-            } catch (e) {
-                // eslint-disable-next-line no-console
-                console.error(e);
-                return null;
-            }
-        }
-    };
-};
diff --git a/apps/admin-x-settings/src/api/offers.ts b/apps/admin-x-settings/src/api/offers.ts
index 7aba3330de6..51af4b8e3c5 100644
--- a/apps/admin-x-settings/src/api/offers.ts
+++ b/apps/admin-x-settings/src/api/offers.ts
@@ -1,4 +1,5 @@
-import {Meta, createQuery} from '../utils/api/hooks';
+import {Meta, createMutation, createQuery, createQueryWithId} from '../utils/api/hooks';
+import {updateQueryCache} from '../utils/api/updateQueries';
 
 export type Offer = {
     id: string;
@@ -26,9 +27,29 @@ export interface OffersResponseType {
     offers: Offer[]
 }
 
+export interface OfferEditResponseType extends OffersResponseType {
+    meta?: Meta
+}
+
 const dataType = 'OffersResponseType';
 
 export const useBrowseOffers = createQuery<OffersResponseType>({
     dataType,
     path: '/offers/'
 });
+
+export const useBrowseOffersById = createQueryWithId<OffersResponseType>({
+    dataType,
+    path: `/offers/`
+});
+
+export const useEditOffer = createMutation<OfferEditResponseType, Offer>({
+    method: 'PUT',
+    path: offer => `/offers/${offer.id}/`,
+    body: offer => ({offers: [offer]}),
+    updateQueries: {
+        dataType,
+        emberUpdateType: 'createOrUpdate',
+        update: updateQueryCache('offers')
+    }
+});
diff --git a/apps/admin-x-settings/src/api/recommendations.ts b/apps/admin-x-settings/src/api/recommendations.ts
index adcb49b5794..e203a864f99 100644
--- a/apps/admin-x-settings/src/api/recommendations.ts
+++ b/apps/admin-x-settings/src/api/recommendations.ts
@@ -1,5 +1,5 @@
 import {InfiniteData} from '@tanstack/react-query';
-import {Meta, apiUrl, createInfiniteQuery, createMutation, useFetchApi} from '../utils/api/hooks';
+import {Meta, createInfiniteQuery, createMutation} from '../utils/api/hooks';
 
 export type Recommendation = {
     id: string
@@ -77,28 +77,11 @@ export const useAddRecommendation = createMutation<RecommendationResponseType, P
     }
 });
 
-export const useGetRecommendationByUrl = () => {
-    const fetchApi = useFetchApi();
-    const path = '/recommendations/';
-
-    return {
-        async query(url: URL): Promise<RecommendationResponseType | null> {
-            const urlFilter = `url:~'${url.host.replace('www.', '')}${url.pathname.replace(/\/$/, '')}'`;
-            const endpoint = apiUrl(path, {filter: urlFilter});
-            try {
-                const result = await fetchApi(endpoint, {
-                    method: 'GET',
-                    timeout: 5000
-                });
-                return result as RecommendationResponseType;
-            } catch (e) {
-                // eslint-disable-next-line no-console
-                console.error(e);
-                return null;
-            }
-        }
-    };
-};
+export const useCheckRecommendation = createMutation<RecommendationResponseType, URL>({
+    method: 'POST',
+    path: () => '/recommendations/check/',
+    body: url => ({recommendations: [{url: url.toString()}]})
+});
 
 export type IncomingRecommendation = {
     id: string
diff --git a/apps/admin-x-settings/src/components/ExitSettingsButton.tsx b/apps/admin-x-settings/src/components/ExitSettingsButton.tsx
index d0b7e5df8e9..e6ce5906721 100644
--- a/apps/admin-x-settings/src/components/ExitSettingsButton.tsx
+++ b/apps/admin-x-settings/src/components/ExitSettingsButton.tsx
@@ -1,7 +1,5 @@
-import Button from '../admin-x-ds/global/Button';
 import React from 'react';
-import useGlobalDirtyState from '../hooks/useGlobalDirtyState';
-import {confirmIfDirty} from '../utils/modals';
+import {Button, confirmIfDirty, useGlobalDirtyState} from '@tryghost/admin-x-design-system';
 
 const ExitSettingsButton: React.FC = () => {
     const {isDirty} = useGlobalDirtyState();
diff --git a/apps/admin-x-settings/src/components/SearchableSection.tsx b/apps/admin-x-settings/src/components/SearchableSection.tsx
new file mode 100644
index 00000000000..8196ba0b57f
--- /dev/null
+++ b/apps/admin-x-settings/src/components/SearchableSection.tsx
@@ -0,0 +1,12 @@
+import {SettingSection, SettingSectionProps} from '@tryghost/admin-x-design-system';
+import {useSearch} from './providers/ServiceProvider';
+
+const SearchableSection: React.FC<Omit<SettingSectionProps, 'isVisible'> & {keywords: string[]}> = ({keywords, ...props}) => {
+    const {checkVisible} = useSearch();
+
+    return (
+        <SettingSection isVisible={checkVisible(keywords)} {...props} />
+    );
+};
+
+export default SearchableSection;
diff --git a/apps/admin-x-settings/src/components/Sidebar.tsx b/apps/admin-x-settings/src/components/Sidebar.tsx
index 084b1e5c81f..e35f3e85a33 100644
--- a/apps/admin-x-settings/src/components/Sidebar.tsx
+++ b/apps/admin-x-settings/src/components/Sidebar.tsx
@@ -1,28 +1,40 @@
-import Button from '../admin-x-ds/global/Button';
 import GhostLogo from '../assets/images/orb-pink.png';
-import Icon from '../admin-x-ds/global/Icon';
 import React, {useEffect, useRef} from 'react';
-import SettingNavItem from '../admin-x-ds/settings/SettingNavItem';
-import SettingNavSection from '../admin-x-ds/settings/SettingNavSection';
-import TextField from '../admin-x-ds/global/form/TextField';
 import clsx from 'clsx';
 import useFeatureFlag from '../hooks/useFeatureFlag';
 import useRouting from '../hooks/useRouting';
+import {Button, Icon, SettingNavItem, SettingNavItemProps, SettingNavSection, TextField, useFocusContext} from '@tryghost/admin-x-design-system';
 import {searchKeywords as advancedSearchKeywords} from './settings/advanced/AdvancedSettings';
 import {searchKeywords as emailSearchKeywords} from './settings/email/EmailSettings';
 import {searchKeywords as generalSearchKeywords} from './settings/general/GeneralSettings';
 import {getSettingValues} from '../api/settings';
 import {searchKeywords as membershipSearchKeywords} from './settings/membership/MembershipSettings';
 import {searchKeywords as siteSearchKeywords} from './settings/site/SiteSettings';
-import {useFocusContext} from '../admin-x-ds/providers/DesignSystemProvider';
 import {useGlobalData} from './providers/GlobalDataProvider';
+import {useScrollSectionContext, useScrollSectionNav} from '../hooks/useScrollSection';
 import {useSearch} from './providers/ServiceProvider';
 
+const NavItem: React.FC<Omit<SettingNavItemProps, 'isVisible' | 'isCurrent'> & {keywords: string[]}> = ({keywords, navid, ...props}) => {
+    const {ref, props: scrollProps} = useScrollSectionNav(navid);
+    const {currentSection} = useScrollSectionContext();
+    const {checkVisible} = useSearch();
+
+    return <SettingNavItem
+        ref={ref}
+        isCurrent={currentSection === navid}
+        isVisible={checkVisible(keywords)}
+        navid={navid}
+        {...scrollProps}
+        {...props}
+    />;
+};
+
 const Sidebar: React.FC = () => {
-    const {filter, setFilter} = useSearch();
+    const {filter, setFilter, checkVisible} = useSearch();
     const {updateRoute} = useRouting();
     const searchInputRef = useRef<HTMLInputElement | null>(null);
     const {isAnyTextFieldFocused} = useFocusContext();
+    const hasOffers = useFeatureFlag('adminXOffers');
 
     // Focus in on search field when pressing "/"
     useEffect(() => {
@@ -64,7 +76,7 @@ const Sidebar: React.FC = () => {
         setFilter(e.target.value);
 
         if (e.target.value) {
-            document.getElementById('admin-x-root')?.scrollTo({top: 0, left: 0});
+            document.getElementById('admin-x-settings')?.scrollTo({top: 0, left: 0});
         }
     };
 
@@ -82,50 +94,51 @@ const Sidebar: React.FC = () => {
                 }} /> : <div className='absolute right-0 top-[20px] hidden rounded border border-grey-400 bg-white px-1.5 py-0.5 text-2xs font-semibold uppercase tracking-wider text-grey-600 shadow-[0px_1px_#CED4D9] dark:bg-grey-800 dark:text-grey-500 tablet:!visible tablet:right-3 tablet:top-[7px] tablet:!block'>/</div>}
             </div>
             <div className={navClasses} id='admin-x-settings-sidebar'>
-                <SettingNavSection keywords={Object.values(generalSearchKeywords).flat()} title="General settings">
-                    <SettingNavItem icon='textfield' keywords={generalSearchKeywords.titleAndDescription} navid='general' title="Title & description" onClick={handleSectionClick} />
-                    <SettingNavItem icon='world-clock' keywords={generalSearchKeywords.timeZone} navid='timezone' title="Timezone" onClick={handleSectionClick} />
-                    <SettingNavItem icon='language' keywords={generalSearchKeywords.publicationLanguage} navid='publication-language' title="Publication language" onClick={handleSectionClick} />
-                    <SettingNavItem icon='layer' keywords={generalSearchKeywords.metadata} navid='metadata' title="Meta data" onClick={handleSectionClick} />
-                    <SettingNavItem icon='twitter-x' keywords={generalSearchKeywords.twitter} navid='twitter' title="X card" onClick={handleSectionClick} />
-                    <SettingNavItem icon='facebook' keywords={generalSearchKeywords.facebook} navid='facebook' title="Facebook card" onClick={handleSectionClick} />
-                    <SettingNavItem icon='like' keywords={generalSearchKeywords.socialAccounts} navid='social-accounts' title="Social accounts" onClick={handleSectionClick} />
-                    <SettingNavItem icon='lock-locked' keywords={generalSearchKeywords.lockSite} navid='locksite' title="Make this site private" onClick={handleSectionClick} />
-                    <SettingNavItem icon='user-page' keywords={generalSearchKeywords.users} navid='staff' title="Staff" onClick={handleSectionClick} />
+                <SettingNavSection isVisible={checkVisible(Object.values(generalSearchKeywords).flat())} title="General settings">
+                    <NavItem icon='textfield' keywords={generalSearchKeywords.titleAndDescription} navid='general' title="Title & description" onClick={handleSectionClick} />
+                    <NavItem icon='world-clock' keywords={generalSearchKeywords.timeZone} navid='timezone' title="Timezone" onClick={handleSectionClick} />
+                    <NavItem icon='language' keywords={generalSearchKeywords.publicationLanguage} navid='publication-language' title="Publication language" onClick={handleSectionClick} />
+                    <NavItem icon='layer' keywords={generalSearchKeywords.metadata} navid='metadata' title="Meta data" onClick={handleSectionClick} />
+                    <NavItem icon='twitter-x' keywords={generalSearchKeywords.twitter} navid='twitter' title="X card" onClick={handleSectionClick} />
+                    <NavItem icon='facebook' keywords={generalSearchKeywords.facebook} navid='facebook' title="Facebook card" onClick={handleSectionClick} />
+                    <NavItem icon='like' keywords={generalSearchKeywords.socialAccounts} navid='social-accounts' title="Social accounts" onClick={handleSectionClick} />
+                    <NavItem icon='lock-locked' keywords={generalSearchKeywords.lockSite} navid='locksite' title="Make this site private" onClick={handleSectionClick} />
+                    <NavItem icon='user-page' keywords={generalSearchKeywords.users} navid='staff' title="Staff" onClick={handleSectionClick} />
                 </SettingNavSection>
 
-                <SettingNavSection keywords={Object.values(siteSearchKeywords).flat()} title="Site">
-                    <SettingNavItem icon='palette' keywords={siteSearchKeywords.design} navid='design' title="Design & branding" onClick={handleSectionClick} />
-                    <SettingNavItem icon='navigation' keywords={siteSearchKeywords.navigation} navid='navigation' title="Navigation" onClick={handleSectionClick} />
-                    <SettingNavItem icon='megaphone' keywords={siteSearchKeywords.announcementBar} navid='announcement-bar' title="Announcement bar" onClick={handleSectionClick} />
+                <SettingNavSection isVisible={checkVisible(Object.values(siteSearchKeywords).flat())} title="Site">
+                    <NavItem icon='palette' keywords={siteSearchKeywords.design} navid='design' title="Design & branding" onClick={handleSectionClick} />
+                    <NavItem icon='navigation' keywords={siteSearchKeywords.navigation} navid='navigation' title="Navigation" onClick={handleSectionClick} />
+                    <NavItem icon='megaphone' keywords={siteSearchKeywords.announcementBar} navid='announcement-bar' title="Announcement bar" onClick={handleSectionClick} />
                 </SettingNavSection>
 
-                <SettingNavSection keywords={Object.values(membershipSearchKeywords).flat()} title="Membership">
-                    <SettingNavItem icon='key' keywords={membershipSearchKeywords.access} navid='members' title="Access" onClick={handleSectionClick} />
-                    <SettingNavItem icon='portal' keywords={membershipSearchKeywords.portal} navid='portal' title="Portal" onClick={handleSectionClick} />
-                    <SettingNavItem icon='bills' keywords={membershipSearchKeywords.tiers} navid='tiers' title="Tiers" onClick={handleSectionClick} />
-                    {hasTipsAndDonations && <SettingNavItem icon='piggybank' keywords={membershipSearchKeywords.tips} navid='tips-or-donations' title="Tips or donations" onClick={handleSectionClick} />}
-                    <SettingNavItem icon='emailfield' keywords={membershipSearchKeywords.embedSignupForm} navid='embed-signup-form' title="Embeddable signup form" onClick={handleSectionClick} />
-                    {hasRecommendations && <SettingNavItem icon='heart' keywords={membershipSearchKeywords.recommendations} navid='recommendations' title="Recommendations" onClick={handleSectionClick} />}
-                    <SettingNavItem icon='baseline-chart' keywords={membershipSearchKeywords.analytics} navid='analytics' title="Analytics" onClick={handleSectionClick} />
+                <SettingNavSection isVisible={checkVisible(Object.values(membershipSearchKeywords).flat())} title="Membership">
+                    <NavItem icon='key' keywords={membershipSearchKeywords.access} navid='members' title="Access" onClick={handleSectionClick} />
+                    <NavItem icon='portal' keywords={membershipSearchKeywords.portal} navid='portal' title="Portal" onClick={handleSectionClick} />
+                    <NavItem icon='bills' keywords={membershipSearchKeywords.tiers} navid='tiers' title="Tiers" onClick={handleSectionClick} />
+                    {hasTipsAndDonations && <NavItem icon='piggybank' keywords={membershipSearchKeywords.tips} navid='tips-or-donations' title="Tips or donations" onClick={handleSectionClick} />}
+                    <NavItem icon='emailfield' keywords={membershipSearchKeywords.embedSignupForm} navid='embed-signup-form' title="Embeddable signup form" onClick={handleSectionClick} />
+                    {hasRecommendations && <NavItem icon='heart' keywords={membershipSearchKeywords.recommendations} navid='recommendations' title="Recommendations" onClick={handleSectionClick} />}
+                    <NavItem icon='baseline-chart' keywords={membershipSearchKeywords.analytics} navid='analytics' title="Analytics" onClick={handleSectionClick} />
+                    {hasOffers && <NavItem icon='discount' keywords={membershipSearchKeywords.offers} navid='offers' title="Offers" onClick={handleSectionClick} />}
                 </SettingNavSection>
 
-                <SettingNavSection keywords={Object.values(emailSearchKeywords).flat()} title="Email newsletter">
-                    <SettingNavItem icon='email-check' keywords={emailSearchKeywords.enableNewsletters} navid='enable-newsletters' title="Newsletter sending" onClick={handleSectionClick} />
+                <SettingNavSection isVisible={checkVisible(Object.values(emailSearchKeywords).flat())} title="Email newsletter">
+                    <NavItem icon='email-check' keywords={emailSearchKeywords.enableNewsletters} navid='enable-newsletters' title="Newsletter sending" onClick={handleSectionClick} />
                     {newslettersEnabled !== 'disabled' && (
                         <>
-                            <SettingNavItem icon='recepients' keywords={emailSearchKeywords.defaultRecipients} navid='default-recipients' title="Default recipients" onClick={handleSectionClick} />
-                            <SettingNavItem icon='email' keywords={emailSearchKeywords.newsletters} navid='newsletters' title="Newsletters" onClick={handleSectionClick} />
-                            {!config.mailgunIsConfigured && <SettingNavItem icon='at-sign' keywords={emailSearchKeywords.mailgun} navid='mailgun' title="Mailgun settings" onClick={handleSectionClick} />}
+                            <NavItem icon='recepients' keywords={emailSearchKeywords.defaultRecipients} navid='default-recipients' title="Default recipients" onClick={handleSectionClick} />
+                            <NavItem icon='email' keywords={emailSearchKeywords.newsletters} navid='newsletters' title="Newsletters" onClick={handleSectionClick} />
+                            {!config.mailgunIsConfigured && <NavItem icon='at-sign' keywords={emailSearchKeywords.mailgun} navid='mailgun' title="Mailgun settings" onClick={handleSectionClick} />}
                         </>
                     )}
                 </SettingNavSection>
 
-                <SettingNavSection keywords={Object.values(advancedSearchKeywords).flat()} title="Advanced">
-                    <SettingNavItem icon='modules-3' keywords={advancedSearchKeywords.integrations} navid='integrations' title="Integrations" onClick={handleSectionClick} />
-                    <SettingNavItem icon='brackets' keywords={advancedSearchKeywords.codeInjection} navid='code-injection' title="Code injection" onClick={handleSectionClick} />
-                    <SettingNavItem icon='labs-flask' keywords={advancedSearchKeywords.labs} navid='labs' title="Labs" onClick={handleSectionClick} />
-                    <SettingNavItem icon='time-back' keywords={advancedSearchKeywords.history} navid='history' title="History" onClick={handleSectionClick} />
+                <SettingNavSection isVisible={checkVisible(Object.values(advancedSearchKeywords).flat())} title="Advanced">
+                    <NavItem icon='modules-3' keywords={advancedSearchKeywords.integrations} navid='integrations' title="Integrations" onClick={handleSectionClick} />
+                    <NavItem icon='brackets' keywords={advancedSearchKeywords.codeInjection} navid='code-injection' title="Code injection" onClick={handleSectionClick} />
+                    <NavItem icon='labs-flask' keywords={advancedSearchKeywords.labs} navid='labs' title="Labs" onClick={handleSectionClick} />
+                    <NavItem icon='time-back' keywords={advancedSearchKeywords.history} navid='history' title="History" onClick={handleSectionClick} />
                 </SettingNavSection>
 
                 {!filter &&
diff --git a/apps/admin-x-settings/src/components/TopLevelGroup.tsx b/apps/admin-x-settings/src/components/TopLevelGroup.tsx
new file mode 100644
index 00000000000..aa7aa1ddb58
--- /dev/null
+++ b/apps/admin-x-settings/src/components/TopLevelGroup.tsx
@@ -0,0 +1,28 @@
+import React, {useEffect, useState} from 'react';
+import useRouting from '../hooks/useRouting';
+import {SettingGroup as Base, SettingGroupProps} from '@tryghost/admin-x-design-system';
+import {useScrollSection} from '../hooks/useScrollSection';
+import {useSearch} from './providers/ServiceProvider';
+
+const TopLevelGroup: React.FC<Omit<SettingGroupProps, 'isVisible' | 'highlight'> & {keywords: string[]}> = ({keywords, navid, ...props}) => {
+    const {checkVisible} = useSearch();
+    const {route} = useRouting();
+    const [highlight, setHighlight] = useState(false);
+    const {ref} = useScrollSection(navid);
+
+    useEffect(() => {
+        setHighlight(route === navid);
+    }, [route, navid]);
+
+    useEffect(() => {
+        if (highlight) {
+            setTimeout(() => {
+                setHighlight(false);
+            }, 3000);
+        }
+    }, [highlight]);
+
+    return <Base ref={ref} highlight={highlight} isVisible={checkVisible(keywords)} navid={navid} {...props} />;
+};
+
+export default TopLevelGroup;
diff --git a/apps/admin-x-settings/src/components/providers/RoutingProvider.tsx b/apps/admin-x-settings/src/components/providers/RoutingProvider.tsx
index 2c31a6766a9..0c5bea557e4 100644
--- a/apps/admin-x-settings/src/components/providers/RoutingProvider.tsx
+++ b/apps/admin-x-settings/src/components/providers/RoutingProvider.tsx
@@ -62,6 +62,9 @@ const modalPaths: {[key: string]: ModalName} = {
     'recommendations/edit': 'EditRecommendationModal',
     'announcement-bar/edit': 'AnnouncementBarModal',
     'embed-signup-form/show': 'EmbedSignupFormModal',
+    'offers/edit': 'OffersModal',
+    'offers/new': 'AddOfferModal',
+    'offers/:id': 'EditOfferModal',
     about: 'AboutModal'
 };
 
diff --git a/apps/admin-x-settings/src/components/providers/routing/modals.tsx b/apps/admin-x-settings/src/components/providers/routing/modals.tsx
index a3fbcfa9e62..6d944b760ec 100644
--- a/apps/admin-x-settings/src/components/providers/routing/modals.tsx
+++ b/apps/admin-x-settings/src/components/providers/routing/modals.tsx
@@ -4,11 +4,13 @@ import type {RoutingModalProps} from '../RoutingProvider';
 import AboutModal from '../../settings/general/About';
 import AddIntegrationModal from '../../settings/advanced/integrations/AddIntegrationModal';
 import AddNewsletterModal from '../../settings/email/newsletters/AddNewsletterModal';
+import AddOfferModal from '../../settings/membership/offers/AddOfferModal';
 import AddRecommendationModal from '../../settings/membership/recommendations/AddRecommendationModal';
 import AmpModal from '../../settings/advanced/integrations/AmpModal';
 import AnnouncementBarModal from '../../settings/site/AnnouncementBarModal';
 import CustomIntegrationModal from '../../settings/advanced/integrations/CustomIntegrationModal';
 import DesignAndThemeModal from '../../settings/site/DesignAndThemeModal';
+import EditOfferModal from '../../settings/membership/offers/EditOfferModal';
 import EditRecommendationModal from '../../settings/membership/recommendations/EditRecommendationModal';
 import EmbedSignupFormModal from '../../settings/membership/embedSignup/EmbedSignupFormModal';
 import FirstpromoterModal from '../../settings/advanced/integrations/FirstPromoterModal';
@@ -16,6 +18,7 @@ import HistoryModal from '../../settings/advanced/HistoryModal';
 import InviteUserModal from '../../settings/general/InviteUserModal';
 import NavigationModal from '../../settings/site/NavigationModal';
 import NewsletterDetailModal from '../../settings/email/newsletters/NewsletterDetailModal';
+import OffersModal from '../../settings/membership/offers/OffersModal';
 import PinturaModal from '../../settings/advanced/integrations/PinturaModal';
 import PortalModal from '../../settings/membership/portal/PortalModal';
 import SlackModal from '../../settings/advanced/integrations/SlackModal';
@@ -48,6 +51,9 @@ const modals = {
     ZapierModal,
     AnnouncementBarModal,
     EmbedSignupFormModal,
+    OffersModal,
+    AddOfferModal,
+    EditOfferModal,
     AboutModal
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 } satisfies {[key: string]: ModalComponent<any>};
diff --git a/apps/admin-x-settings/src/components/settings/advanced/AdvancedSettings.tsx b/apps/admin-x-settings/src/components/settings/advanced/AdvancedSettings.tsx
index e42e0b31bbb..ba9daa8cb61 100644
--- a/apps/admin-x-settings/src/components/settings/advanced/AdvancedSettings.tsx
+++ b/apps/admin-x-settings/src/components/settings/advanced/AdvancedSettings.tsx
@@ -3,23 +3,23 @@ import History from './History';
 import Integrations from './Integrations';
 import Labs from './Labs';
 import React from 'react';
-import SettingSection from '../../../admin-x-ds/settings/SettingSection';
+import SearchableSection from '../../SearchableSection';
 
 export const searchKeywords = {
-    integrations: ['integrations', 'zapier', 'slack', 'amp', 'unsplash', 'first promoter', 'firstpromoter', 'pintura', 'disqus', 'analytics', 'ulysses', 'typeform', 'buffer', 'plausible', 'github'],
-    codeInjection: ['code injection', 'head', 'footer'],
-    labs: ['labs', 'alpha', 'beta', 'flag', 'import', 'export', 'migrate', 'routes', 'redirect', 'translation', 'delete', 'content', 'editor', 'substack', 'migration', 'portal'],
-    history: ['history', 'log', 'events', 'user events', 'staff']
+    integrations: ['advanced', 'integrations', 'zapier', 'slack', 'amp', 'unsplash', 'first promoter', 'firstpromoter', 'pintura', 'disqus', 'analytics', 'ulysses', 'typeform', 'buffer', 'plausible', 'github'],
+    codeInjection: ['advanced', 'code injection', 'head', 'footer'],
+    labs: ['advanced', 'labs', 'alpha', 'beta', 'flag', 'import', 'export', 'migrate', 'routes', 'redirect', 'translation', 'delete', 'content', 'editor', 'substack', 'migration', 'portal'],
+    history: ['advanced', 'history', 'log', 'events', 'user events', 'staff']
 };
 
 const AdvancedSettings: React.FC = () => {
     return (
-        <SettingSection keywords={Object.values(searchKeywords).flat()} title='Advanced'>
+        <SearchableSection keywords={Object.values(searchKeywords).flat()} title='Advanced'>
             <Integrations keywords={searchKeywords.integrations} />
             <CodeInjection keywords={searchKeywords.codeInjection} />
             <Labs keywords={searchKeywords.labs} />
             <History keywords={searchKeywords.history} />
-        </SettingSection>
+        </SearchableSection>
     );
 };
 
diff --git a/apps/admin-x-settings/src/components/settings/advanced/CodeInjection.tsx b/apps/admin-x-settings/src/components/settings/advanced/CodeInjection.tsx
index 5d10867c1b2..3ce32cf1801 100644
--- a/apps/admin-x-settings/src/components/settings/advanced/CodeInjection.tsx
+++ b/apps/admin-x-settings/src/components/settings/advanced/CodeInjection.tsx
@@ -1,14 +1,11 @@
-import Button from '../../../admin-x-ds/global/Button';
-import CodeEditor from '../../../admin-x-ds/global/form/CodeEditor';
 import CodeModal from './code/CodeModal';
 import NiceModal from '@ebay/nice-modal-react';
 import React, {useMemo, useRef, useState} from 'react';
-import SettingGroup from '../../../admin-x-ds/settings/SettingGroup';
-import TabView from '../../../admin-x-ds/global/TabView';
+import TopLevelGroup from '../../TopLevelGroup';
 import useSettingGroup from '../../../hooks/useSettingGroup';
+import {Button, CodeEditor, TabView, withErrorBoundary} from '@tryghost/admin-x-design-system';
 import {ReactCodeMirrorRef} from '@uiw/react-codemirror';
 import {getSettingValues} from '../../../api/settings';
-import {withErrorBoundary} from '../../../admin-x-ds/global/ErrorBoundary';
 
 const CodeInjection: React.FC<{ keywords: string[] }> = ({keywords}) => {
     const {
@@ -58,7 +55,7 @@ const CodeInjection: React.FC<{ keywords: string[] }> = ({keywords}) => {
     ] as const;
 
     return (
-        <SettingGroup
+        <TopLevelGroup
             description="Add custom code to your publication"
             isEditing={isEditing}
             keywords={keywords}
@@ -90,7 +87,7 @@ const CodeInjection: React.FC<{ keywords: string[] }> = ({keywords}) => {
                     />
                 </div>
             )}
-        </SettingGroup>
+        </TopLevelGroup>
     );
 };
 
diff --git a/apps/admin-x-settings/src/components/settings/advanced/History.tsx b/apps/admin-x-settings/src/components/settings/advanced/History.tsx
index 7f1e11b50e1..2fe4046cc11 100644
--- a/apps/admin-x-settings/src/components/settings/advanced/History.tsx
+++ b/apps/admin-x-settings/src/components/settings/advanced/History.tsx
@@ -1,8 +1,7 @@
-import Button from '../../../admin-x-ds/global/Button';
 import React from 'react';
-import SettingGroup from '../../../admin-x-ds/settings/SettingGroup';
+import TopLevelGroup from '../../TopLevelGroup';
 import useRouting from '../../../hooks/useRouting';
-import {withErrorBoundary} from '../../../admin-x-ds/global/ErrorBoundary';
+import {Button, withErrorBoundary} from '@tryghost/admin-x-design-system';
 
 const History: React.FC<{ keywords: string[] }> = ({keywords}) => {
     const {updateRoute} = useRouting();
@@ -11,7 +10,7 @@ const History: React.FC<{ keywords: string[] }> = ({keywords}) => {
     };
 
     return (
-        <SettingGroup
+        <TopLevelGroup
             customButtons={<Button color='green' label='View history' link linkWithPadding onClick={openHistoryModal}/>}
             description="View system event log"
             keywords={keywords}
diff --git a/apps/admin-x-settings/src/components/settings/advanced/HistoryModal.tsx b/apps/admin-x-settings/src/components/settings/advanced/HistoryModal.tsx
index f8ad35d3fa0..5c01a522a05 100644
--- a/apps/admin-x-settings/src/components/settings/advanced/HistoryModal.tsx
+++ b/apps/admin-x-settings/src/components/settings/advanced/HistoryModal.tsx
@@ -1,23 +1,10 @@
-import Avatar from '../../../admin-x-ds/global/Avatar';
-import Button from '../../../admin-x-ds/global/Button';
-import Icon from '../../../admin-x-ds/global/Icon';
-import InfiniteScrollListener from '../../../admin-x-ds/global/InfiniteScrollListener';
-import List from '../../../admin-x-ds/global/List';
-import ListItem from '../../../admin-x-ds/global/ListItem';
-import Modal from '../../../admin-x-ds/global/modal/Modal';
 import NiceModal, {useModal} from '@ebay/nice-modal-react';
-import NoValueLabel from '../../../admin-x-ds/global/NoValueLabel';
-import Popover from '../../../admin-x-ds/global/Popover';
-import Select, {SelectOption} from '../../../admin-x-ds/global/form/Select';
-import Toggle from '../../../admin-x-ds/global/form/Toggle';
-import ToggleGroup from '../../../admin-x-ds/global/form/ToggleGroup';
 import useFilterableApi from '../../../hooks/useFilterableApi';
 import useRouting from '../../../hooks/useRouting';
 import {Action, getActionTitle, getContextResource, getLinkTarget, isBulkAction, useBrowseActions} from '../../../api/actions';
-import {LoadOptions} from '../../../admin-x-ds/global/form/MultiSelect';
+import {Avatar, Button, Icon, InfiniteScrollListener, List, ListItem, LoadSelectOptions, Modal, NoValueLabel, Popover, Select, SelectOption, Toggle, ToggleGroup, debounce} from '@tryghost/admin-x-design-system';
 import {RoutingModalProps} from '../../providers/RoutingProvider';
 import {User} from '../../../api/users';
-import {debounce} from '../../../utils/debounce';
 import {generateAvatarColor, getInitials} from '../../../utils/helpers';
 import {useCallback, useState} from 'react';
 
@@ -78,7 +65,7 @@ const HistoryFilter: React.FC<{
     const {updateRoute} = useRouting();
     const usersApi = useFilterableApi<User, 'users', 'name'>({path: '/users/', filterKey: 'name', responseKey: 'users'});
 
-    const loadOptions: LoadOptions = async (input, callback) => {
+    const loadOptions: LoadSelectOptions = async (input, callback) => {
         const users = await usersApi.loadData(input);
         callback(users.map(user => ({label: user.name, value: user.id})));
     };
diff --git a/apps/admin-x-settings/src/components/settings/advanced/Integrations.tsx b/apps/admin-x-settings/src/components/settings/advanced/Integrations.tsx
index a42b11da1e9..ef6c973fa23 100644
--- a/apps/admin-x-settings/src/components/settings/advanced/Integrations.tsx
+++ b/apps/admin-x-settings/src/components/settings/advanced/Integrations.tsx
@@ -1,16 +1,11 @@
-import Button from '../../../admin-x-ds/global/Button';
-import ConfirmationModal from '../../../admin-x-ds/global/modal/ConfirmationModal';
-import Icon from '../../../admin-x-ds/global/Icon';
-import List from '../../../admin-x-ds/global/List';
-import ListItem from '../../../admin-x-ds/global/ListItem';
 import NiceModal from '@ebay/nice-modal-react';
-import NoValueLabel from '../../../admin-x-ds/global/NoValueLabel';
 import React, {useState} from 'react';
-import SettingGroup from '../../../admin-x-ds/settings/SettingGroup';
-import TabView from '../../../admin-x-ds/global/TabView';
+import TopLevelGroup from '../../TopLevelGroup';
 import useHandleError from '../../../utils/api/handleError';
+import usePinturaEditor from '../../../hooks/usePinturaEditor';
 import useRouting from '../../../hooks/useRouting';
 import {ReactComponent as AmpIcon} from '../../../assets/icons/amp.svg';
+import {Button, ConfirmationModal, Icon, List, ListItem, NoValueLabel, TabView, showToast, withErrorBoundary} from '@tryghost/admin-x-design-system';
 import {ReactComponent as FirstPromoterIcon} from '../../../assets/icons/firstpromoter.svg';
 import {Integration, useBrowseIntegrations, useDeleteIntegration} from '../../../api/integrations';
 import {ReactComponent as PinturaIcon} from '../../../assets/icons/pintura.svg';
@@ -18,9 +13,7 @@ import {ReactComponent as SlackIcon} from '../../../assets/icons/slack.svg';
 import {ReactComponent as UnsplashIcon} from '../../../assets/icons/unsplash.svg';
 import {ReactComponent as ZapierIcon} from '../../../assets/icons/zapier.svg';
 import {getSettingValues} from '../../../api/settings';
-import {showToast} from '../../../admin-x-ds/global/Toast';
 import {useGlobalData} from '../../providers/GlobalDataProvider';
-import {withErrorBoundary} from '../../../admin-x-ds/global/ErrorBoundary';
 
 interface IntegrationItemProps {
     icon?: React.ReactNode,
@@ -85,8 +78,10 @@ const BuiltInIntegrations: React.FC = () => {
 
     const zapierDisabled = config.hostSettings?.limits?.customIntegrations?.disabled;
 
+    const pinturaEditor = usePinturaEditor();
+
     const {settings} = useGlobalData();
-    const [ampEnabled, unsplashEnabled, pinturaEnabled, firstPromoterEnabled, slackUrl, slackUsername] = getSettingValues<boolean>(settings, ['amp', 'unsplash', 'pintura', 'firstpromoter', 'slack_url', 'slack_username']);
+    const [ampEnabled, unsplashEnabled, firstPromoterEnabled, slackUrl, slackUsername] = getSettingValues<boolean>(settings, ['amp', 'unsplash', 'pintura', 'firstpromoter', 'slack_url', 'slack_username']);
 
     return (
         <List titleSeparator={false}>
@@ -140,7 +135,7 @@ const BuiltInIntegrations: React.FC = () => {
                 action={() => {
                     openModal('integrations/pintura');
                 }}
-                active={pinturaEnabled}
+                active={pinturaEditor.isEnabled}
                 detail='Advanced image editing' icon=
                     {<PinturaIcon className='h-8 w-8' />} title
                     ='Pintura' />
@@ -224,7 +219,7 @@ const Integrations: React.FC<{ keywords: string[] }> = ({keywords}) => {
     );
 
     return (
-        <SettingGroup
+        <TopLevelGroup
             customButtons={buttons}
             description="Make Ghost work with apps and tools"
             keywords={keywords}
@@ -239,7 +234,7 @@ const Integrations: React.FC<{ keywords: string[] }> = ({keywords}) => {
                 }} />
             </div>
             <TabView<'built-in' | 'custom'> selectedTab={selectedTab} tabs={tabs} onTabChange={setSelectedTab} />
-        </SettingGroup>
+        </TopLevelGroup>
     );
 };
 
diff --git a/apps/admin-x-settings/src/components/settings/advanced/Labs.tsx b/apps/admin-x-settings/src/components/settings/advanced/Labs.tsx
index 4457847e913..83653b29fe2 100644
--- a/apps/admin-x-settings/src/components/settings/advanced/Labs.tsx
+++ b/apps/admin-x-settings/src/components/settings/advanced/Labs.tsx
@@ -1,14 +1,11 @@
 import AlphaFeatures from './labs/AlphaFeatures';
 import BetaFeatures from './labs/BetaFeatures';
-import Button from '../../../admin-x-ds/global/Button';
 import LabsBubbles from '../../../assets/images/labs-bg.svg';
 import MigrationOptions from './labs/MigrationOptions';
 import React, {useState} from 'react';
-import SettingGroup from '../../../admin-x-ds/settings/SettingGroup';
-import SettingGroupHeader from '../../../admin-x-ds/settings/SettingGroupHeader';
-import TabView, {Tab} from '../../../admin-x-ds/global/TabView';
+import TopLevelGroup from '../../TopLevelGroup';
+import {Button, SettingGroupHeader, Tab, TabView, withErrorBoundary} from '@tryghost/admin-x-design-system';
 import {useGlobalData} from '../../providers/GlobalDataProvider';
-import {withErrorBoundary} from '../../../admin-x-ds/global/ErrorBoundary';
 
 type LabsTab = 'labs-migration-options' | 'labs-alpha-features' | 'labs-beta-features';
 
@@ -36,7 +33,7 @@ const Labs: React.FC<{ keywords: string[] }> = ({keywords}) => {
     ].filter(Boolean) as Tab<LabsTab>[];
 
     return (
-        <SettingGroup
+        <TopLevelGroup
             customHeader={
                 <div className='z-10 flex items-start justify-between'>
                     <SettingGroupHeader description='This is a testing ground for new or experimental features. They may change, break or inexplicably disappear at any time.' title='Labs' />
@@ -63,7 +60,7 @@ const Labs: React.FC<{ keywords: string[] }> = ({keywords}) => {
                     <img className='absolute -right-6 -top-6 dark:opacity-10' src={LabsBubbles} />
                 </div>
             }
-        </SettingGroup>
+        </TopLevelGroup>
     );
 };
 
diff --git a/apps/admin-x-settings/src/components/settings/advanced/code/CodeModal.tsx b/apps/admin-x-settings/src/components/settings/advanced/code/CodeModal.tsx
index 04eb1b0c59f..d4a274127c1 100644
--- a/apps/admin-x-settings/src/components/settings/advanced/code/CodeModal.tsx
+++ b/apps/admin-x-settings/src/components/settings/advanced/code/CodeModal.tsx
@@ -1,7 +1,6 @@
-import CodeEditor from '../../../../admin-x-ds/global/form/CodeEditor';
-import Modal from '../../../../admin-x-ds/global/modal/Modal';
 import NiceModal, {useModal} from '@ebay/nice-modal-react';
 import React, {useMemo} from 'react';
+import {CodeEditor, Modal} from '@tryghost/admin-x-design-system';
 
 interface CodeModalProps {
     hint?: React.ReactNode;
diff --git a/apps/admin-x-settings/src/components/settings/advanced/integrations/APIKeys.tsx b/apps/admin-x-settings/src/components/settings/advanced/integrations/APIKeys.tsx
index a5aaa057d59..c49e0fe87d1 100644
--- a/apps/admin-x-settings/src/components/settings/advanced/integrations/APIKeys.tsx
+++ b/apps/admin-x-settings/src/components/settings/advanced/integrations/APIKeys.tsx
@@ -1,7 +1,6 @@
-import Button from '../../../../admin-x-ds/global/Button';
-import Heading from '../../../../admin-x-ds/global/Heading';
 import React, {ReactNode, useState} from 'react';
 import clsx from 'clsx';
+import {Button, Heading} from '@tryghost/admin-x-design-system';
 
 export interface APIKeyFieldProps {
     label?: string;
diff --git a/apps/admin-x-settings/src/components/settings/advanced/integrations/AddIntegrationModal.tsx b/apps/admin-x-settings/src/components/settings/advanced/integrations/AddIntegrationModal.tsx
index 94254fa31a8..0b2df7e2c3f 100644
--- a/apps/admin-x-settings/src/components/settings/advanced/integrations/AddIntegrationModal.tsx
+++ b/apps/admin-x-settings/src/components/settings/advanced/integrations/AddIntegrationModal.tsx
@@ -1,11 +1,8 @@
-import Form from '../../../../admin-x-ds/global/form/Form';
-import LimitModal from '../../../../admin-x-ds/global/modal/LimitModal';
-import Modal from '../../../../admin-x-ds/global/modal/Modal';
 import NiceModal, {useModal} from '@ebay/nice-modal-react';
 import React, {useEffect, useState} from 'react';
-import TextField from '../../../../admin-x-ds/global/form/TextField';
 import useHandleError from '../../../../utils/api/handleError';
 import useRouting from '../../../../hooks/useRouting';
+import {Form, LimitModal, Modal, TextField} from '@tryghost/admin-x-design-system';
 import {HostLimitError, useLimiter} from '../../../../hooks/useLimiter';
 import {RoutingModalProps} from '../../../providers/RoutingProvider';
 import {useCreateIntegration} from '../../../../api/integrations';
diff --git a/apps/admin-x-settings/src/components/settings/advanced/integrations/AmpModal.tsx b/apps/admin-x-settings/src/components/settings/advanced/integrations/AmpModal.tsx
index ebab03c9e39..c9bf7d13463 100644
--- a/apps/admin-x-settings/src/components/settings/advanced/integrations/AmpModal.tsx
+++ b/apps/admin-x-settings/src/components/settings/advanced/integrations/AmpModal.tsx
@@ -1,11 +1,8 @@
-import Form from '../../../../admin-x-ds/global/form/Form';
 import IntegrationHeader from './IntegrationHeader';
-import Modal from '../../../../admin-x-ds/global/modal/Modal';
 import NiceModal from '@ebay/nice-modal-react';
-import TextField from '../../../../admin-x-ds/global/form/TextField';
-import Toggle from '../../../../admin-x-ds/global/form/Toggle';
 import useHandleError from '../../../../utils/api/handleError';
 import useRouting from '../../../../hooks/useRouting';
+import {Form, Modal, TextField, Toggle} from '@tryghost/admin-x-design-system';
 import {ReactComponent as Icon} from '../../../../assets/icons/amp.svg';
 import {Setting, getSettingValues, useEditSettings} from '../../../../api/settings';
 import {useEffect, useState} from 'react';
diff --git a/apps/admin-x-settings/src/components/settings/advanced/integrations/CustomIntegrationModal.tsx b/apps/admin-x-settings/src/components/settings/advanced/integrations/CustomIntegrationModal.tsx
index 70ae842c404..44354b593ea 100644
--- a/apps/admin-x-settings/src/components/settings/advanced/integrations/CustomIntegrationModal.tsx
+++ b/apps/admin-x-settings/src/components/settings/advanced/integrations/CustomIntegrationModal.tsx
@@ -1,21 +1,16 @@
 import APIKeys from './APIKeys';
-import ConfirmationModal from '../../../../admin-x-ds/global/modal/ConfirmationModal';
-import Form from '../../../../admin-x-ds/global/form/Form';
-import ImageUpload from '../../../../admin-x-ds/global/form/ImageUpload';
-import Modal from '../../../../admin-x-ds/global/modal/Modal';
 import NiceModal, {useModal} from '@ebay/nice-modal-react';
 import React, {useEffect, useState} from 'react';
-import TextField from '../../../../admin-x-ds/global/form/TextField';
 import WebhooksTable from './WebhooksTable';
 import useForm from '../../../../hooks/useForm';
 import useHandleError from '../../../../utils/api/handleError';
 import useRouting from '../../../../hooks/useRouting';
 import {APIKey, useRefreshAPIKey} from '../../../../api/apiKeys';
+import {ConfirmationModal, Form, ImageUpload, Modal, TextField, showToast} from '@tryghost/admin-x-design-system';
 import {Integration, useBrowseIntegrations, useEditIntegration} from '../../../../api/integrations';
 import {RoutingModalProps} from '../../../providers/RoutingProvider';
 import {getGhostPaths} from '../../../../utils/helpers';
 import {getImageUrl, useUploadImage} from '../../../../api/images';
-import {showToast} from '../../../../admin-x-ds/global/Toast';
 import {toast} from 'react-hot-toast';
 
 const CustomIntegrationModalContent: React.FC<{integration: Integration}> = ({integration}) => {
@@ -27,11 +22,17 @@ const CustomIntegrationModalContent: React.FC<{integration: Integration}> = ({in
     const {mutateAsync: uploadImage} = useUploadImage();
     const handleError = useHandleError();
 
-    const {formState, updateForm, handleSave, saveState, errors, clearError, validate} = useForm({
+    const {formState, updateForm, handleSave, saveState, errors, clearError, validate, okProps} = useForm({
         initialState: integration,
+        savingDelay: 500,
+        savedDelay: 500,
         onSave: async () => {
             await editIntegration(formState);
         },
+        onSavedStateReset: () => {
+            modal.remove();
+            updateRoute('integrations');
+        },
         onSaveError: handleError,
         onValidate: () => {
             const newErrors: Record<string, string> = {};
@@ -82,19 +83,17 @@ const CustomIntegrationModalContent: React.FC<{integration: Integration}> = ({in
         afterClose={() => {
             updateRoute('integrations');
         }}
+        buttonsDisabled={okProps.disabled}
         dirty={saveState === 'unsaved'}
-        okColor='black'
-        okLabel='Save & close'
+        okColor={okProps.color}
+        okLabel={okProps.label || 'Save & close'}
         size='md'
         testId='custom-integration-modal'
         title={formState.name}
         stickyFooter
         onOk={async () => {
             toast.remove();
-            if (await handleSave()) {
-                modal.remove();
-                updateRoute('integrations');
-            } else {
+            if (!(await handleSave({fakeWhenUnchanged: true}))) {
                 showToast({
                     type: 'pageError',
                     message: 'Can\'t save integration, please double check that you\'ve filled all mandatory fields.'
diff --git a/apps/admin-x-settings/src/components/settings/advanced/integrations/FirstPromoterModal.tsx b/apps/admin-x-settings/src/components/settings/advanced/integrations/FirstPromoterModal.tsx
index 9702648f41c..e373930a6bb 100644
--- a/apps/admin-x-settings/src/components/settings/advanced/integrations/FirstPromoterModal.tsx
+++ b/apps/admin-x-settings/src/components/settings/advanced/integrations/FirstPromoterModal.tsx
@@ -1,11 +1,8 @@
-import Form from '../../../../admin-x-ds/global/form/Form';
 import IntegrationHeader from './IntegrationHeader';
-import Modal from '../../../../admin-x-ds/global/modal/Modal';
 import NiceModal from '@ebay/nice-modal-react';
-import TextField from '../../../../admin-x-ds/global/form/TextField';
-import Toggle from '../../../../admin-x-ds/global/form/Toggle';
 import useHandleError from '../../../../utils/api/handleError';
 import useRouting from '../../../../hooks/useRouting';
+import {Form, Modal, TextField, Toggle} from '@tryghost/admin-x-design-system';
 import {ReactComponent as Icon} from '../../../../assets/icons/firstpromoter.svg';
 import {Setting, getSettingValues, useEditSettings} from '../../../../api/settings';
 import {useEffect, useState} from 'react';
diff --git a/apps/admin-x-settings/src/components/settings/advanced/integrations/PinturaModal.tsx b/apps/admin-x-settings/src/components/settings/advanced/integrations/PinturaModal.tsx
index 5d1590781eb..1a6a85a89ac 100644
--- a/apps/admin-x-settings/src/components/settings/advanced/integrations/PinturaModal.tsx
+++ b/apps/admin-x-settings/src/components/settings/advanced/integrations/PinturaModal.tsx
@@ -1,15 +1,11 @@
-import Button from '../../../../admin-x-ds/global/Button';
-import Form from '../../../../admin-x-ds/global/form/Form';
 import IntegrationHeader from './IntegrationHeader';
-import Modal from '../../../../admin-x-ds/global/modal/Modal';
 import NiceModal from '@ebay/nice-modal-react';
-import Toggle from '../../../../admin-x-ds/global/form/Toggle';
 import pinturaScreenshot from '../../../../assets/images/pintura-screenshot.png';
 import useHandleError from '../../../../utils/api/handleError';
 import useRouting from '../../../../hooks/useRouting';
+import {Button, Form, Modal, Toggle, showToast} from '@tryghost/admin-x-design-system';
 import {ReactComponent as Icon} from '../../../../assets/icons/pintura.svg';
 import {Setting, getSettingValues, useEditSettings} from '../../../../api/settings';
-import {showToast} from '../../../../admin-x-ds/global/Toast';
 import {useEffect, useRef, useState} from 'react';
 import {useGlobalData} from '../../../providers/GlobalDataProvider';
 import {useUploadFile} from '../../../../api/files';
diff --git a/apps/admin-x-settings/src/components/settings/advanced/integrations/SlackModal.tsx b/apps/admin-x-settings/src/components/settings/advanced/integrations/SlackModal.tsx
index ad1a31f626c..53c12a7937b 100644
--- a/apps/admin-x-settings/src/components/settings/advanced/integrations/SlackModal.tsx
+++ b/apps/admin-x-settings/src/components/settings/advanced/integrations/SlackModal.tsx
@@ -1,16 +1,12 @@
-import Button from '../../../../admin-x-ds/global/Button';
-import Form from '../../../../admin-x-ds/global/form/Form';
 import IntegrationHeader from './IntegrationHeader';
-import Modal from '../../../../admin-x-ds/global/modal/Modal';
 import NiceModal from '@ebay/nice-modal-react';
-import TextField from '../../../../admin-x-ds/global/form/TextField';
 import toast from 'react-hot-toast';
 import useRouting from '../../../../hooks/useRouting';
 import useSettingGroup from '../../../../hooks/useSettingGroup';
 import validator from 'validator';
+import {Button, Form, Modal, TextField, showToast} from '@tryghost/admin-x-design-system';
 import {ReactComponent as Icon} from '../../../../assets/icons/slack.svg';
 import {getSettingValues} from '../../../../api/settings';
-import {showToast} from '../../../../admin-x-ds/global/Toast';
 import {useTestSlack} from '../../../../api/slack';
 
 const SlackModal = NiceModal.create(() => {
diff --git a/apps/admin-x-settings/src/components/settings/advanced/integrations/UnsplashModal.tsx b/apps/admin-x-settings/src/components/settings/advanced/integrations/UnsplashModal.tsx
index 82f2e16a86f..ba94a0574e7 100644
--- a/apps/admin-x-settings/src/components/settings/advanced/integrations/UnsplashModal.tsx
+++ b/apps/admin-x-settings/src/components/settings/advanced/integrations/UnsplashModal.tsx
@@ -1,10 +1,8 @@
-import Form from '../../../../admin-x-ds/global/form/Form';
 import IntegrationHeader from './IntegrationHeader';
-import Modal from '../../../../admin-x-ds/global/modal/Modal';
 import NiceModal from '@ebay/nice-modal-react';
-import Toggle from '../../../../admin-x-ds/global/form/Toggle';
 import useHandleError from '../../../../utils/api/handleError';
 import useRouting from '../../../../hooks/useRouting';
+import {Form, Modal, Toggle} from '@tryghost/admin-x-design-system';
 import {ReactComponent as Icon} from '../../../../assets/icons/unsplash.svg';
 import {Setting, getSettingValues, useEditSettings} from '../../../../api/settings';
 import {useGlobalData} from '../../../providers/GlobalDataProvider';
diff --git a/apps/admin-x-settings/src/components/settings/advanced/integrations/WebhookModal.tsx b/apps/admin-x-settings/src/components/settings/advanced/integrations/WebhookModal.tsx
index daedd92caaa..cc379ba43ac 100644
--- a/apps/admin-x-settings/src/components/settings/advanced/integrations/WebhookModal.tsx
+++ b/apps/admin-x-settings/src/components/settings/advanced/integrations/WebhookModal.tsx
@@ -1,16 +1,12 @@
-import Form from '../../../../admin-x-ds/global/form/Form';
-import Modal from '../../../../admin-x-ds/global/modal/Modal';
 import NiceModal, {useModal} from '@ebay/nice-modal-react';
 import React from 'react';
-import Select from '../../../../admin-x-ds/global/form/Select';
-import TextField from '../../../../admin-x-ds/global/form/TextField';
 import toast from 'react-hot-toast';
 import useForm from '../../../../hooks/useForm';
 import useHandleError from '../../../../utils/api/handleError';
 import validator from 'validator';
 import webhookEventOptions from './webhookEventOptions';
+import {Form, Modal, Select, TextField, showToast} from '@tryghost/admin-x-design-system';
 import {Webhook, useCreateWebhook, useEditWebhook} from '../../../../api/webhooks';
-import {showToast} from '../../../../admin-x-ds/global/Toast';
 
 interface WebhookModalProps {
     webhook?: Webhook;
diff --git a/apps/admin-x-settings/src/components/settings/advanced/integrations/WebhooksTable.tsx b/apps/admin-x-settings/src/components/settings/advanced/integrations/WebhooksTable.tsx
index c4373d28274..a5900af75b7 100644
--- a/apps/admin-x-settings/src/components/settings/advanced/integrations/WebhooksTable.tsx
+++ b/apps/admin-x-settings/src/components/settings/advanced/integrations/WebhooksTable.tsx
@@ -1,15 +1,9 @@
-import Button from '../../../../admin-x-ds/global/Button';
-import ConfirmationModal from '../../../../admin-x-ds/global/modal/ConfirmationModal';
 import NiceModal from '@ebay/nice-modal-react';
-import Table from '../../../../admin-x-ds/global/Table';
-import TableCell from '../../../../admin-x-ds/global/TableCell';
-import TableHead from '../../../../admin-x-ds/global/TableHead';
-import TableRow from '../../../../admin-x-ds/global/TableRow';
 import WebhookModal from './WebhookModal';
 import useHandleError from '../../../../utils/api/handleError';
+import {Button, ConfirmationModal, Table, TableCell, TableHead, TableRow, showToast} from '@tryghost/admin-x-design-system';
 import {Integration} from '../../../../api/integrations';
 import {getWebhookEventLabel} from './webhookEventOptions';
-import {showToast} from '../../../../admin-x-ds/global/Toast';
 import {useDeleteWebhook} from '../../../../api/webhooks';
 
 const WebhooksTable: React.FC<{integration: Integration}> = ({integration}) => {
diff --git a/apps/admin-x-settings/src/components/settings/advanced/integrations/ZapierModal.tsx b/apps/admin-x-settings/src/components/settings/advanced/integrations/ZapierModal.tsx
index 58d6def2f75..8f75ac9327a 100644
--- a/apps/admin-x-settings/src/components/settings/advanced/integrations/ZapierModal.tsx
+++ b/apps/admin-x-settings/src/components/settings/advanced/integrations/ZapierModal.tsx
@@ -1,16 +1,11 @@
 import APIKeys from './APIKeys';
-import Button from '../../../../admin-x-ds/global/Button';
-import ConfirmationModal from '../../../../admin-x-ds/global/modal/ConfirmationModal';
 import IntegrationHeader from './IntegrationHeader';
-import List from '../../../../admin-x-ds/global/List';
-import ListItem from '../../../../admin-x-ds/global/ListItem';
-import Modal from '../../../../admin-x-ds/global/modal/Modal';
 import NiceModal from '@ebay/nice-modal-react';
 import useHandleError from '../../../../utils/api/handleError';
 import useRouting from '../../../../hooks/useRouting';
-import {ReactComponent as ArrowRightIcon} from '../../../../admin-x-ds/assets/icons/arrow-right.svg';
-import {ReactComponent as Icon} from '../../../../assets/icons/zapier.svg';
+import {Button, ConfirmationModal, Icon, List, ListItem, Modal} from '@tryghost/admin-x-design-system';
 import {ReactComponent as Logo} from '../../../../assets/images/zapier-logo.svg';
+import {ReactComponent as ZapierIcon} from '../../../../assets/icons/zapier.svg';
 import {getGhostPaths, resolveAsset} from '../../../../utils/helpers';
 import {useBrowseIntegrations} from '../../../../api/integrations';
 import {useEffect, useState} from 'react';
@@ -111,7 +106,7 @@ const ZapierModal = NiceModal.create(() => {
                     },
                     {label: 'API URL', text: window.location.origin + getGhostPaths().subdir}
                 ]} /></div>}
-                icon={<Icon className='h-14 w-14' />}
+                icon={<ZapierIcon className='h-14 w-14' />}
                 title='Zapier'
             />
 
@@ -125,7 +120,7 @@ const ZapierModal = NiceModal.create(() => {
                             <div className='flex flex-col gap-4 md:flex-row md:items-center'>
                                 <div className='flex shrink-0 flex-nowrap items-center gap-2'>
                                     <img className='h-8 w-8 object-contain dark:invert' role='presentation' src={resolveAsset(template.ghostImage, adminRoot)} />
-                                    <ArrowRightIcon className='h-3 w-3' />
+                                    <Icon name="arrow-right" size="xs" />
                                     <img className='h-8 w-8 object-contain' role='presentation' src={resolveAsset(template.appImage, adminRoot)} />
                                 </div>
                                 <span className='text-sm'>{template.title}</span>
diff --git a/apps/admin-x-settings/src/components/settings/advanced/integrations/webhookEventOptions.tsx b/apps/admin-x-settings/src/components/settings/advanced/integrations/webhookEventOptions.tsx
index d56f9fef4f3..19e62141035 100644
--- a/apps/admin-x-settings/src/components/settings/advanced/integrations/webhookEventOptions.tsx
+++ b/apps/admin-x-settings/src/components/settings/advanced/integrations/webhookEventOptions.tsx
@@ -1,4 +1,4 @@
-import {SelectOptionGroup} from '../../../../admin-x-ds/global/form/Select';
+import {SelectOptionGroup} from '@tryghost/admin-x-design-system';
 
 const webhookEventOptions: SelectOptionGroup[] = [
     {
diff --git a/apps/admin-x-settings/src/components/settings/advanced/labs/AlphaFeatures.tsx b/apps/admin-x-settings/src/components/settings/advanced/labs/AlphaFeatures.tsx
index 9ee19d4217e..14b7f5471b7 100644
--- a/apps/admin-x-settings/src/components/settings/advanced/labs/AlphaFeatures.tsx
+++ b/apps/admin-x-settings/src/components/settings/advanced/labs/AlphaFeatures.tsx
@@ -1,7 +1,7 @@
 import FeatureToggle from './FeatureToggle';
 import LabItem from './LabItem';
-import List from '../../../../admin-x-ds/global/List';
 import React from 'react';
+import {List} from '@tryghost/admin-x-design-system';
 
 const features = [{
     title: 'URL cache',
@@ -52,9 +52,9 @@ const features = [{
     description: 'Set the List-Unsubscribe header in emails',
     flag: 'listUnsubscribeHeader'
 },{
-    title: 'Editor emoji picker',
-    description: <>Trigger an emoji picker when typing <code>{':{search}'}</code> in the editor</>,
-    flag: 'editorEmojiPicker'
+    title: 'AdminX Offers',
+    description: 'Enables the new offers UI in AdminX settings',
+    flag: 'adminXOffers'
 }];
 
 const AlphaFeatures: React.FC = () => {
diff --git a/apps/admin-x-settings/src/components/settings/advanced/labs/BetaFeatures.tsx b/apps/admin-x-settings/src/components/settings/advanced/labs/BetaFeatures.tsx
index 1b731b686b5..f5828476e38 100644
--- a/apps/admin-x-settings/src/components/settings/advanced/labs/BetaFeatures.tsx
+++ b/apps/admin-x-settings/src/components/settings/advanced/labs/BetaFeatures.tsx
@@ -1,14 +1,11 @@
-import Button from '../../../../admin-x-ds/global/Button';
 import FeatureToggle from './FeatureToggle';
-import FileUpload from '../../../../admin-x-ds/global/form/FileUpload';
 import LabItem from './LabItem';
-import List from '../../../../admin-x-ds/global/List';
 import React, {useState} from 'react';
 import useHandleError from '../../../../utils/api/handleError';
 import useRouting from '../../../../hooks/useRouting';
+import {Button, FileUpload, List, showToast} from '@tryghost/admin-x-design-system';
 import {downloadRedirects, useUploadRedirects} from '../../../../api/redirects';
 import {downloadRoutes, useUploadRoutes} from '../../../../api/routes';
-import {showToast} from '../../../../admin-x-ds/global/Toast';
 
 const BetaFeatures: React.FC = () => {
     const {updateRoute} = useRouting();
diff --git a/apps/admin-x-settings/src/components/settings/advanced/labs/FeatureToggle.tsx b/apps/admin-x-settings/src/components/settings/advanced/labs/FeatureToggle.tsx
index 8785fc6ae58..6a80881e709 100644
--- a/apps/admin-x-settings/src/components/settings/advanced/labs/FeatureToggle.tsx
+++ b/apps/admin-x-settings/src/components/settings/advanced/labs/FeatureToggle.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
-import Toggle from '../../../../admin-x-ds/global/form/Toggle';
 import useHandleError from '../../../../utils/api/handleError';
 import {ConfigResponseType, configDataType} from '../../../../api/config';
+import {Toggle} from '@tryghost/admin-x-design-system';
 import {getSettingValue, useEditSettings} from '../../../../api/settings';
 import {useGlobalData} from '../../../providers/GlobalDataProvider';
 import {useQueryClient} from '@tanstack/react-query';
diff --git a/apps/admin-x-settings/src/components/settings/advanced/labs/LabItem.tsx b/apps/admin-x-settings/src/components/settings/advanced/labs/LabItem.tsx
index 236ec199337..bade006619f 100644
--- a/apps/admin-x-settings/src/components/settings/advanced/labs/LabItem.tsx
+++ b/apps/admin-x-settings/src/components/settings/advanced/labs/LabItem.tsx
@@ -1,5 +1,5 @@
-import ListItem from '../../../../admin-x-ds/global/ListItem';
 import React from 'react';
+import {ListItem} from '@tryghost/admin-x-design-system';
 
 const LabItem: React.FC<{
     title?: React.ReactNode;
diff --git a/apps/admin-x-settings/src/components/settings/advanced/labs/MigrationOptions.tsx b/apps/admin-x-settings/src/components/settings/advanced/labs/MigrationOptions.tsx
index b9034c356cb..984d5b55d15 100644
--- a/apps/admin-x-settings/src/components/settings/advanced/labs/MigrationOptions.tsx
+++ b/apps/admin-x-settings/src/components/settings/advanced/labs/MigrationOptions.tsx
@@ -1,13 +1,9 @@
-import Button from '../../../../admin-x-ds/global/Button';
-import ConfirmationModal from '../../../../admin-x-ds/global/modal/ConfirmationModal';
-import FileUpload from '../../../../admin-x-ds/global/form/FileUpload';
 import LabItem from './LabItem';
-import List from '../../../../admin-x-ds/global/List';
 import NiceModal, {useModal} from '@ebay/nice-modal-react';
 import React, {useState} from 'react';
 import useHandleError from '../../../../utils/api/handleError';
+import {Button, ConfirmationModal, FileUpload, List, showToast} from '@tryghost/admin-x-design-system';
 import {downloadAllContent, useDeleteAllContent, useImportContent} from '../../../../api/db';
-import {showToast} from '../../../../admin-x-ds/global/Toast';
 import {useQueryClient} from '@tanstack/react-query';
 
 const ImportModalContent = () => {
diff --git a/apps/admin-x-settings/src/components/settings/email/DefaultRecipients.tsx b/apps/admin-x-settings/src/components/settings/email/DefaultRecipients.tsx
index 1e399cdd06a..5863ce3d8e4 100644
--- a/apps/admin-x-settings/src/components/settings/email/DefaultRecipients.tsx
+++ b/apps/admin-x-settings/src/components/settings/email/DefaultRecipients.tsx
@@ -1,14 +1,11 @@
-import MultiSelect, {MultiSelectOption} from '../../../admin-x-ds/global/form/MultiSelect';
 import React, {useState} from 'react';
-import Select from '../../../admin-x-ds/global/form/Select';
-import SettingGroup from '../../../admin-x-ds/settings/SettingGroup';
-import SettingGroupContent from '../../../admin-x-ds/settings/SettingGroupContent';
+import TopLevelGroup from '../../TopLevelGroup';
 import useDefaultRecipientsOptions from './useDefaultRecipientsOptions';
 import useSettingGroup from '../../../hooks/useSettingGroup';
+import {MultiSelect, MultiSelectOption, Select, SettingGroupContent, withErrorBoundary} from '@tryghost/admin-x-design-system';
 import {MultiValue} from 'react-select';
 import {getOptionLabel} from '../../../utils/helpers';
 import {getSettingValues} from '../../../api/settings';
-import {withErrorBoundary} from '../../../admin-x-ds/global/ErrorBoundary';
 
 type RefipientValueArgs = {
     defaultEmailRecipients: string;
@@ -154,7 +151,7 @@ const DefaultRecipients: React.FC<{ keywords: string[] }> = ({keywords}) => {
     );
 
     return (
-        <SettingGroup
+        <TopLevelGroup
             description='When you publish new content, who do you usually want to send it to?'
             isEditing={isEditing}
             keywords={keywords}
@@ -167,7 +164,7 @@ const DefaultRecipients: React.FC<{ keywords: string[] }> = ({keywords}) => {
             onSave={handleSave}
         >
             {isEditing ? form : values}
-        </SettingGroup>
+        </TopLevelGroup>
     );
 };
 
diff --git a/apps/admin-x-settings/src/components/settings/email/EmailSettings.tsx b/apps/admin-x-settings/src/components/settings/email/EmailSettings.tsx
index 4b12b7a9816..946c1118802 100644
--- a/apps/admin-x-settings/src/components/settings/email/EmailSettings.tsx
+++ b/apps/admin-x-settings/src/components/settings/email/EmailSettings.tsx
@@ -3,12 +3,12 @@ import EnableNewsletters from './EnableNewsletters';
 import MailGun from './Mailgun';
 import Newsletters from './Newsletters';
 import React from 'react';
-import SettingSection from '../../../admin-x-ds/settings/SettingSection';
+import SearchableSection from '../../SearchableSection';
 import {getSettingValues} from '../../../api/settings';
 import {useGlobalData} from '../../providers/GlobalDataProvider';
 
 export const searchKeywords = {
-    enableNewsletters: ['newsletters', 'newsletter sending', 'enable', 'disable', 'turn on', 'turn off'],
+    enableNewsletters: ['emails', 'newsletters', 'newsletter sending', 'enable', 'disable', 'turn on', 'turn off'],
     newsletters: ['newsletters', 'emails'],
     defaultRecipients: ['newsletters', 'default recipients', 'emails'],
     mailgun: ['mailgun', 'emails', 'newsletters']
@@ -19,7 +19,7 @@ const EmailSettings: React.FC = () => {
     const [newslettersEnabled] = getSettingValues(settings, ['editor_default_email_recipients']) as [string];
 
     return (
-        <SettingSection keywords={Object.values(searchKeywords).flat()} title='Email newsletter'>
+        <SearchableSection keywords={Object.values(searchKeywords).flat()} title='Email newsletter'>
             <EnableNewsletters keywords={searchKeywords.enableNewsletters} />
             {newslettersEnabled !== 'disabled' && (
                 <>
@@ -28,7 +28,7 @@ const EmailSettings: React.FC = () => {
                     {!config.mailgunIsConfigured && <MailGun keywords={searchKeywords.mailgun} />}
                 </>
             )}
-        </SettingSection>
+        </SearchableSection>
     );
 };
 
diff --git a/apps/admin-x-settings/src/components/settings/email/EnableNewsletters.tsx b/apps/admin-x-settings/src/components/settings/email/EnableNewsletters.tsx
index c8657aa4b91..532120a46a4 100644
--- a/apps/admin-x-settings/src/components/settings/email/EnableNewsletters.tsx
+++ b/apps/admin-x-settings/src/components/settings/email/EnableNewsletters.tsx
@@ -1,14 +1,10 @@
-import Banner from '../../../admin-x-ds/global/Banner';
-import Icon from '../../../admin-x-ds/global/Icon';
 import React from 'react';
-import SettingGroup from '../../../admin-x-ds/settings/SettingGroup';
-import SettingGroupContent from '../../../admin-x-ds/settings/SettingGroupContent';
-import Toggle from '../../../admin-x-ds/global/form/Toggle';
+import TopLevelGroup from '../../TopLevelGroup';
 import useHandleError from '../../../utils/api/handleError';
 import useRouting from '../../../hooks/useRouting';
+import {Banner, Icon, SettingGroupContent, Toggle, withErrorBoundary} from '@tryghost/admin-x-design-system';
 import {Setting, getSettingValues, useEditSettings} from '../../../api/settings';
 import {useGlobalData} from '../../providers/GlobalDataProvider';
-import {withErrorBoundary} from '../../../admin-x-ds/global/ErrorBoundary';
 
 const EnableNewsletters: React.FC<{ keywords: string[] }> = ({keywords}) => {
     const {settings} = useGlobalData();
@@ -46,7 +42,7 @@ const EnableNewsletters: React.FC<{ keywords: string[] }> = ({keywords}) => {
         </>
     );
 
-    return (<SettingGroup
+    return (<TopLevelGroup
         customButtons={enableToggle}
         description='Newsletter features are active, posts can be sent by email'
         keywords={keywords}
@@ -79,7 +75,7 @@ const EnableNewsletters: React.FC<{ keywords: string[] }> = ({keywords}) => {
                 }
             ]}
         />
-    </SettingGroup>);
+    </TopLevelGroup>);
 };
 
 export default withErrorBoundary(EnableNewsletters, 'Newsletter sending');
diff --git a/apps/admin-x-settings/src/components/settings/email/Mailgun.tsx b/apps/admin-x-settings/src/components/settings/email/Mailgun.tsx
index 78d0f732909..91a6b8643ed 100644
--- a/apps/admin-x-settings/src/components/settings/email/Mailgun.tsx
+++ b/apps/admin-x-settings/src/components/settings/email/Mailgun.tsx
@@ -1,14 +1,9 @@
-import IconLabel from '../../../admin-x-ds/global/IconLabel';
-import Link from '../../../admin-x-ds/global/Link';
 import React from 'react';
-import Select from '../../../admin-x-ds/global/form/Select';
-import SettingGroup from '../../../admin-x-ds/settings/SettingGroup';
-import SettingGroupContent from '../../../admin-x-ds/settings/SettingGroupContent';
-import TextField from '../../../admin-x-ds/global/form/TextField';
+import TopLevelGroup from '../../TopLevelGroup';
 import useHandleError from '../../../utils/api/handleError';
 import useSettingGroup from '../../../hooks/useSettingGroup';
+import {IconLabel, Link, Select, SettingGroupContent, TextField, withErrorBoundary} from '@tryghost/admin-x-design-system';
 import {getSettingValues, useEditSettings} from '../../../api/settings';
-import {withErrorBoundary} from '../../../admin-x-ds/global/ErrorBoundary';
 
 const MAILGUN_REGIONS = [
     {label: '🇺🇸 US', value: 'https://api.mailgun.net/v3'},
@@ -99,7 +94,7 @@ const MailGun: React.FC<{ keywords: string[] }> = ({keywords}) => {
     );
 
     return (
-        <SettingGroup
+        <TopLevelGroup
             description={groupDescription}
             isEditing={isEditing}
             keywords={keywords}
@@ -126,7 +121,7 @@ const MailGun: React.FC<{ keywords: string[] }> = ({keywords}) => {
             }}
         >
             {isEditing ? inputs : values}
-        </SettingGroup>
+        </TopLevelGroup>
     );
 };
 
diff --git a/apps/admin-x-settings/src/components/settings/email/Newsletters.tsx b/apps/admin-x-settings/src/components/settings/email/Newsletters.tsx
index c10b228605a..69ef92d885f 100644
--- a/apps/admin-x-settings/src/components/settings/email/Newsletters.tsx
+++ b/apps/admin-x-settings/src/components/settings/email/Newsletters.tsx
@@ -1,16 +1,13 @@
-import Button from '../../../admin-x-ds/global/Button';
-import ConfirmationModal from '../../../admin-x-ds/global/modal/ConfirmationModal';
 import NewslettersList from './newsletters/NewslettersList';
 import NiceModal, {useModal} from '@ebay/nice-modal-react';
 import React, {ReactNode, useEffect, useState} from 'react';
-import SettingGroup from '../../../admin-x-ds/settings/SettingGroup';
-import TabView from '../../../admin-x-ds/global/TabView';
+import TopLevelGroup from '../../TopLevelGroup';
 import useHandleError from '../../../utils/api/handleError';
 import useQueryParams from '../../../hooks/useQueryParams';
 import useRouting from '../../../hooks/useRouting';
 import {APIError} from '../../../utils/errors';
+import {Button, ConfirmationModal, TabView, withErrorBoundary} from '@tryghost/admin-x-design-system';
 import {useBrowseNewsletters, useVerifyNewsletterEmail} from '../../../api/newsletters';
-import {withErrorBoundary} from '../../../admin-x-ds/global/ErrorBoundary';
 
 const NavigateToNewsletter = ({id, children}: {id: string; children: ReactNode}) => {
     const modal = useModal();
@@ -89,7 +86,7 @@ const Newsletters: React.FC<{ keywords: string[] }> = ({keywords}) => {
     ];
 
     return (
-        <SettingGroup
+        <TopLevelGroup
             customButtons={buttons}
             keywords={keywords}
             navid='newsletters'
@@ -102,7 +99,7 @@ const Newsletters: React.FC<{ keywords: string[] }> = ({keywords}) => {
                 link
                 onClick={() => fetchNextPage()}
             />}
-        </SettingGroup>
+        </TopLevelGroup>
     );
 };
 
diff --git a/apps/admin-x-settings/src/components/settings/email/newsletters/AddNewsletterModal.tsx b/apps/admin-x-settings/src/components/settings/email/newsletters/AddNewsletterModal.tsx
index 65ffa517974..fb50fba4afe 100644
--- a/apps/admin-x-settings/src/components/settings/email/newsletters/AddNewsletterModal.tsx
+++ b/apps/admin-x-settings/src/components/settings/email/newsletters/AddNewsletterModal.tsx
@@ -1,17 +1,11 @@
-import Form from '../../../../admin-x-ds/global/form/Form';
-import LimitModal from '../../../../admin-x-ds/global/modal/LimitModal';
-import Modal from '../../../../admin-x-ds/global/modal/Modal';
 import NiceModal, {useModal} from '@ebay/nice-modal-react';
 import React, {useEffect} from 'react';
-import TextArea from '../../../../admin-x-ds/global/form/TextArea';
-import TextField from '../../../../admin-x-ds/global/form/TextField';
-import Toggle from '../../../../admin-x-ds/global/form/Toggle';
 import useForm from '../../../../hooks/useForm';
 import useHandleError from '../../../../utils/api/handleError';
 import useRouting from '../../../../hooks/useRouting';
+import {Form, LimitModal, Modal, TextArea, TextField, Toggle, showToast} from '@tryghost/admin-x-design-system';
 import {HostLimitError, useLimiter} from '../../../../hooks/useLimiter';
 import {RoutingModalProps} from '../../../providers/RoutingProvider';
-import {showToast} from '../../../../admin-x-ds/global/Toast';
 import {toast} from 'react-hot-toast';
 import {useAddNewsletter} from '../../../../api/newsletters';
 import {useBrowseMembers} from '../../../../api/members';
diff --git a/apps/admin-x-settings/src/components/settings/email/newsletters/NewsletterDetailModal.tsx b/apps/admin-x-settings/src/components/settings/email/newsletters/NewsletterDetailModal.tsx
index 2163d1e09a0..c756ad27e86 100644
--- a/apps/admin-x-settings/src/components/settings/email/newsletters/NewsletterDetailModal.tsx
+++ b/apps/admin-x-settings/src/components/settings/email/newsletters/NewsletterDetailModal.tsx
@@ -1,38 +1,19 @@
-import Button from '../../../../admin-x-ds/global/Button';
-import ButtonGroup from '../../../../admin-x-ds/global/ButtonGroup';
-import ColorPickerField from '../../../../admin-x-ds/global/form/ColorPickerField';
-import ConfirmationModal from '../../../../admin-x-ds/global/modal/ConfirmationModal';
-import Form from '../../../../admin-x-ds/global/form/Form';
-import Heading from '../../../../admin-x-ds/global/Heading';
-import Hint from '../../../../admin-x-ds/global/Hint';
-import HtmlField from '../../../../admin-x-ds/global/form/HtmlField';
-import Icon from '../../../../admin-x-ds/global/Icon';
-import ImageUpload from '../../../../admin-x-ds/global/form/ImageUpload';
-import LimitModal from '../../../../admin-x-ds/global/modal/LimitModal';
 import NewsletterPreview from './NewsletterPreview';
 import NiceModal, {useModal} from '@ebay/nice-modal-react';
 import React, {useEffect, useState} from 'react';
-import Select, {SelectOption} from '../../../../admin-x-ds/global/form/Select';
-import Separator from '../../../../admin-x-ds/global/Separator';
-import TabView, {Tab} from '../../../../admin-x-ds/global/TabView';
-import TextArea from '../../../../admin-x-ds/global/form/TextArea';
-import TextField from '../../../../admin-x-ds/global/form/TextField';
-import Toggle from '../../../../admin-x-ds/global/form/Toggle';
-import ToggleGroup from '../../../../admin-x-ds/global/form/ToggleGroup';
 import useFeatureFlag from '../../../../hooks/useFeatureFlag';
 import useForm, {ErrorMessages} from '../../../../hooks/useForm';
 import useHandleError from '../../../../utils/api/handleError';
 import useRouting from '../../../../hooks/useRouting';
 import useSettingGroup from '../../../../hooks/useSettingGroup';
 import validator from 'validator';
+import {Button, ButtonGroup, ColorPickerField, ConfirmationModal, Form, Heading, Hint, HtmlField, Icon, ImageUpload, LimitModal, PreviewModalContent, Select, SelectOption, Separator, Tab, TabView, TextArea, TextField, Toggle, ToggleGroup, showToast} from '@tryghost/admin-x-design-system';
 import {HostLimitError, useLimiter} from '../../../../hooks/useLimiter';
 import {Newsletter, useBrowseNewsletters, useEditNewsletter} from '../../../../api/newsletters';
-import {PreviewModalContent} from '../../../../admin-x-ds/global/modal/PreviewModal';
 import {RoutingModalProps} from '../../../providers/RoutingProvider';
 import {fullEmailAddress} from '../../../../api/site';
 import {getImageUrl, useUploadImage} from '../../../../api/images';
 import {getSettingValues} from '../../../../api/settings';
-import {showToast} from '../../../../admin-x-ds/global/Toast';
 import {textColorForBackgroundColor} from '@tryghost/color-utils';
 import {useGlobalData} from '../../../providers/GlobalDataProvider';
 
@@ -438,8 +419,9 @@ const NewsletterDetailModalContent: React.FC<{newsletter: Newsletter; onlyOne: b
     const {updateRoute} = useRouting();
     const handleError = useHandleError();
 
-    const {formState, saveState, updateForm, setFormState, handleSave, validate, errors, clearError} = useForm({
+    const {formState, saveState, updateForm, setFormState, handleSave, validate, errors, clearError, okProps} = useForm({
         initialState: newsletter,
+        savingDelay: 500,
         onSave: async () => {
             const {newsletters, meta} = await editNewsletter(formState);
             if (meta?.sent_email_verification) {
@@ -489,12 +471,12 @@ const NewsletterDetailModalContent: React.FC<{newsletter: Newsletter; onlyOne: b
 
     return <PreviewModalContent
         afterClose={() => updateRoute('newsletters')}
-        buttonsDisabled={saveState === 'saving'}
+        buttonsDisabled={okProps.disabled}
         cancelLabel='Close'
         deviceSelector={false}
         dirty={saveState === 'unsaved'}
-        okColor={saveState === 'saved' ? 'green' : 'black'}
-        okLabel={saveState === 'saved' ? 'Saved' : (saveState === 'saving' ? 'Saving...' : 'Save')}
+        okColor={okProps.color}
+        okLabel={okProps.label || 'Save'}
         preview={preview}
         previewBgColor={'grey'}
         previewToolbar={false}
@@ -503,7 +485,7 @@ const NewsletterDetailModalContent: React.FC<{newsletter: Newsletter; onlyOne: b
         testId='newsletter-modal'
         title='Newsletter'
         onOk={async () => {
-            if (!(await handleSave())) {
+            if (!(await handleSave({fakeWhenUnchanged: true}))) {
                 showToast({
                     type: 'pageError',
                     message: 'Can\'t save newsletter, please double check that you\'ve filled all mandatory fields.'
diff --git a/apps/admin-x-settings/src/components/settings/email/newsletters/NewsletterPreview.tsx b/apps/admin-x-settings/src/components/settings/email/newsletters/NewsletterPreview.tsx
index 3fc2be8ab14..5e294678726 100644
--- a/apps/admin-x-settings/src/components/settings/email/newsletters/NewsletterPreview.tsx
+++ b/apps/admin-x-settings/src/components/settings/email/newsletters/NewsletterPreview.tsx
@@ -84,9 +84,9 @@ const NewsletterPreview: React.FC<{newsletter: Newsletter}> = ({newsletter}) =>
 
     const colors = hasEmailCustomization ? {
         backgroundColor: backgroundColor(),
-        borderColor: borderColor(),
+        borderColor: borderColor() || undefined,
         secondaryBorderColor,
-        titleColor: titleColor(),
+        titleColor: titleColor() || undefined,
         textColor,
         secondaryTextColor
     } : {};
diff --git a/apps/admin-x-settings/src/components/settings/email/newsletters/NewsletterPreviewContent.tsx b/apps/admin-x-settings/src/components/settings/email/newsletters/NewsletterPreviewContent.tsx
index f5ff9ab39ae..3bea96cc37f 100644
--- a/apps/admin-x-settings/src/components/settings/email/newsletters/NewsletterPreviewContent.tsx
+++ b/apps/admin-x-settings/src/components/settings/email/newsletters/NewsletterPreviewContent.tsx
@@ -1,10 +1,9 @@
 import CoverImage from '../../../../assets/images/user-cover.png';
-import Icon from '../../../../admin-x-ds/global/Icon';
 import LatestPosts1 from '../../../../assets/images/latest-posts-1.png';
 import LatestPosts2 from '../../../../assets/images/latest-posts-2.png';
 import LatestPosts3 from '../../../../assets/images/latest-posts-3.png';
 import clsx from 'clsx';
-import {ReactComponent as GhostOrb} from '../../../../admin-x-ds/assets/images/ghost-orb.svg';
+import {GhostOrb, Icon} from '@tryghost/admin-x-design-system';
 import {textColorForBackgroundColor} from '@tryghost/color-utils';
 
 const NewsletterPreviewContent: React.FC<{
diff --git a/apps/admin-x-settings/src/components/settings/email/newsletters/NewslettersList.tsx b/apps/admin-x-settings/src/components/settings/email/newsletters/NewslettersList.tsx
index 7b18e59eaf6..0ee272a9274 100644
--- a/apps/admin-x-settings/src/components/settings/email/newsletters/NewslettersList.tsx
+++ b/apps/admin-x-settings/src/components/settings/email/newsletters/NewslettersList.tsx
@@ -1,10 +1,6 @@
-import Button from '../../../../admin-x-ds/global/Button';
-import NoValueLabel from '../../../../admin-x-ds/global/NoValueLabel';
 import React from 'react';
-import Table from '../../../../admin-x-ds/global/Table';
-import TableCell from '../../../../admin-x-ds/global/TableCell';
-import TableRow from '../../../../admin-x-ds/global/TableRow';
 import useRouting from '../../../../hooks/useRouting';
+import {Button, NoValueLabel, Table, TableCell, TableRow} from '@tryghost/admin-x-design-system';
 import {Newsletter} from '../../../../api/newsletters';
 import {numberWithCommas} from '../../../../utils/helpers';
 
diff --git a/apps/admin-x-settings/src/components/settings/email/useDefaultRecipientsOptions.tsx b/apps/admin-x-settings/src/components/settings/email/useDefaultRecipientsOptions.tsx
index 4548432e172..7bcfc794c69 100644
--- a/apps/admin-x-settings/src/components/settings/email/useDefaultRecipientsOptions.tsx
+++ b/apps/admin-x-settings/src/components/settings/email/useDefaultRecipientsOptions.tsx
@@ -1,10 +1,9 @@
 import useFilterableApi from '../../../hooks/useFilterableApi';
 import {GroupBase, MultiValue} from 'react-select';
 import {Label} from '../../../api/labels';
-import {LoadOptions, MultiSelectOption} from '../../../admin-x-ds/global/form/MultiSelect';
+import {LoadMultiSelectOptions, MultiSelectOption, debounce} from '@tryghost/admin-x-design-system';
 import {Offer} from '../../../api/offers';
 import {Tier} from '../../../api/tiers';
-import {debounce} from '../../../utils/debounce';
 import {isObjectId} from '../../../utils/helpers';
 import {useEffect, useState} from 'react';
 
@@ -29,7 +28,7 @@ const useDefaultRecipientsOptions = (selectedOption: string, defaultEmailRecipie
     const labelOption = (label: Label): MultiSelectOption => ({value: `label:${label.slug}`, label: label.name, color: 'grey'});
     const offerOption = (offer: Offer): MultiSelectOption => ({value: `offer_redemptions:${offer.id}`, label: offer.name, color: 'black'});
 
-    const loadOptions: LoadOptions = async (input, callback) => {
+    const loadOptions: LoadMultiSelectOptions = async (input, callback) => {
         const [tiersData, labelsData, offersData] = await Promise.all([tiers.loadData(input), labels.loadData(input), offers.loadData(input)]);
 
         const segmentOptionGroups: GroupBase<MultiSelectOption>[] = [
diff --git a/apps/admin-x-settings/src/components/settings/general/About.tsx b/apps/admin-x-settings/src/components/settings/general/About.tsx
index 61987e2fc22..8ce8872b33d 100644
--- a/apps/admin-x-settings/src/components/settings/general/About.tsx
+++ b/apps/admin-x-settings/src/components/settings/general/About.tsx
@@ -1,9 +1,6 @@
-import Icon from '../../../admin-x-ds/global/Icon';
-import Modal from '../../../admin-x-ds/global/modal/Modal';
 import NiceModal from '@ebay/nice-modal-react';
-import Separator from '../../../admin-x-ds/global/Separator';
 import useRouting from '../../../hooks/useRouting';
-import {ReactComponent as GhostLogo} from '../../../admin-x-ds/assets/images/ghost-logo.svg';
+import {GhostLogo, Icon, Modal, Separator} from '@tryghost/admin-x-design-system';
 import {RoutingModalProps} from '../../providers/RoutingProvider';
 import {linkToGitHubReleases} from '../../../utils/linkToGithubReleases';
 import {showDatabaseWarning} from '../../../utils/showDatabaseWarning';
@@ -45,8 +42,8 @@ const AboutModal = NiceModal.create<RoutingModalProps>(({}) => {
             }}
             cancelLabel=''
             footer={(<></>)}
-            size={540}
             topRightContent='close'
+            width={540}
         >
             <div className='flex flex-col gap-4 pb-7 text-sm'>
                 <GhostLogo className="h-auto w-[120px] dark:invert"/>
diff --git a/apps/admin-x-settings/src/components/settings/general/Facebook.tsx b/apps/admin-x-settings/src/components/settings/general/Facebook.tsx
index 1e751585c40..75227ce9c92 100644
--- a/apps/admin-x-settings/src/components/settings/general/Facebook.tsx
+++ b/apps/admin-x-settings/src/components/settings/general/Facebook.tsx
@@ -1,15 +1,11 @@
-import ImageUpload from '../../../admin-x-ds/global/form/ImageUpload';
 import React from 'react';
-import SettingGroup from '../../../admin-x-ds/settings/SettingGroup';
-import SettingGroupContent from '../../../admin-x-ds/settings/SettingGroupContent';
-import TextField from '../../../admin-x-ds/global/form/TextField';
+import TopLevelGroup from '../../TopLevelGroup';
 import useHandleError from '../../../utils/api/handleError';
 import usePinturaEditor from '../../../hooks/usePinturaEditor';
 import useSettingGroup from '../../../hooks/useSettingGroup';
-import {ReactComponent as FacebookLogo} from '../../../admin-x-ds/assets/images/facebook-logo.svg';
+import {FacebookLogo, ImageUpload, SettingGroupContent, TextField, withErrorBoundary} from '@tryghost/admin-x-design-system';
 import {getImageUrl, useUploadImage} from '../../../api/images';
 import {getSettingValues} from '../../../api/settings';
-import {withErrorBoundary} from '../../../admin-x-ds/global/ErrorBoundary';
 
 const Facebook: React.FC<{ keywords: string[] }> = ({keywords}) => {
     const {
@@ -25,17 +21,10 @@ const Facebook: React.FC<{ keywords: string[] }> = ({keywords}) => {
 
     const {mutateAsync: uploadImage} = useUploadImage();
     // const [unsplashEnabled] = getSettingValues<boolean>(localSettings, ['unsplash']);
-    const [pinturaJsUrl] = getSettingValues<string>(localSettings, ['pintura_js_url']);
-    const [pinturaCssUrl] = getSettingValues<string>(localSettings, ['pintura_css_url']);
     // const [showUnsplash, setShowUnsplash] = useState<boolean>(false);
     const handleError = useHandleError();
 
-    const editor = usePinturaEditor(
-        {config: {
-            jsUrl: pinturaJsUrl || '',
-            cssUrl: pinturaCssUrl || ''
-        }}
-    );
+    const editor = usePinturaEditor();
 
     const [
         facebookTitle, facebookDescription, facebookImage, siteTitle, siteDescription
@@ -124,7 +113,7 @@ const Facebook: React.FC<{ keywords: string[] }> = ({keywords}) => {
     );
 
     return (
-        <SettingGroup
+        <TopLevelGroup
             description='Customize structured data of your site'
             isEditing={isEditing}
             keywords={keywords}
@@ -138,7 +127,7 @@ const Facebook: React.FC<{ keywords: string[] }> = ({keywords}) => {
         >
             {values}
             {isEditing ? inputFields : null}
-        </SettingGroup>
+        </TopLevelGroup>
     );
 };
 
diff --git a/apps/admin-x-settings/src/components/settings/general/GeneralSettings.tsx b/apps/admin-x-settings/src/components/settings/general/GeneralSettings.tsx
index c1ec7e8f1b0..e27b703f931 100644
--- a/apps/admin-x-settings/src/components/settings/general/GeneralSettings.tsx
+++ b/apps/admin-x-settings/src/components/settings/general/GeneralSettings.tsx
@@ -4,7 +4,7 @@ import Facebook from './Facebook';
 import LockSite from './LockSite';
 import Metadata from './Metadata';
 import PublicationLanguage from './PublicationLanguage';
-import SettingSection from '../../../admin-x-ds/settings/SettingSection';
+import SearchableSection from '../../SearchableSection';
 import SocialAccounts from './SocialAccounts';
 import TimeZone from './TimeZone';
 import TitleAndDescription from './TitleAndDescription';
@@ -12,20 +12,20 @@ import Twitter from './Twitter';
 import Users from './Users';
 
 export const searchKeywords = {
-    titleAndDescription: ['title and description', 'site title', 'site description', 'title & description'],
-    timeZone: ['time', 'date', 'site timezone', 'time zone'],
-    publicationLanguage: ['publication language', 'locale'],
-    metadata: ['metadata', 'title', 'description', 'search', 'engine', 'google', 'meta data'],
-    twitter: ['twitter card', 'structured data', 'rich cards', 'x card'],
-    facebook: ['facebook card', 'structured data', 'rich cards'],
-    socialAccounts: ['social accounts', 'facebook', 'twitter', 'structured data', 'rich cards'],
-    lockSite: ['password protection', 'lock site', 'make this site private'],
-    users: ['users and permissions', 'roles', 'staff', 'invite people', 'contributors', 'editors', 'authors', 'administrators']
+    titleAndDescription: ['general', 'title and description', 'site title', 'site description', 'title & description'],
+    timeZone: ['general', 'time', 'date', 'site timezone', 'time zone'],
+    publicationLanguage: ['general', 'publication language', 'locale'],
+    metadata: ['general', 'metadata', 'title', 'description', 'search', 'engine', 'google', 'meta data'],
+    twitter: ['general', 'twitter card', 'structured data', 'rich cards', 'x card'],
+    facebook: ['general', 'facebook card', 'structured data', 'rich cards'],
+    socialAccounts: ['general', 'social accounts', 'facebook', 'twitter', 'structured data', 'rich cards'],
+    lockSite: ['general', 'password protection', 'lock site', 'make this site private'],
+    users: ['general', 'users and permissions', 'roles', 'staff', 'invite people', 'contributors', 'editors', 'authors', 'administrators']
 };
 
 const GeneralSettings: React.FC = () => {
     return (
-        <SettingSection keywords={Object.values(searchKeywords).flat()} title="General settings">
+        <SearchableSection keywords={Object.values(searchKeywords).flat()} title="General settings">
             <TitleAndDescription keywords={searchKeywords.titleAndDescription} />
             <TimeZone keywords={searchKeywords.timeZone} />
             <PublicationLanguage keywords={searchKeywords.publicationLanguage} />
@@ -35,7 +35,7 @@ const GeneralSettings: React.FC = () => {
             <SocialAccounts keywords={searchKeywords.socialAccounts} />
             <LockSite keywords={searchKeywords.lockSite} />
             <Users keywords={searchKeywords.users} />
-        </SettingSection>
+        </SearchableSection>
     );
 };
 
diff --git a/apps/admin-x-settings/src/components/settings/general/InviteUserModal.tsx b/apps/admin-x-settings/src/components/settings/general/InviteUserModal.tsx
index 8ef43fafb2a..88d73ae488e 100644
--- a/apps/admin-x-settings/src/components/settings/general/InviteUserModal.tsx
+++ b/apps/admin-x-settings/src/components/settings/general/InviteUserModal.tsx
@@ -1,12 +1,9 @@
-import Modal from '../../../admin-x-ds/global/modal/Modal';
 import NiceModal from '@ebay/nice-modal-react';
-import Radio from '../../../admin-x-ds/global/form/Radio';
-import TextField from '../../../admin-x-ds/global/form/TextField';
 import useHandleError from '../../../utils/api/handleError';
 import useRouting from '../../../hooks/useRouting';
 import validator from 'validator';
 import {HostLimitError, useLimiter} from '../../../hooks/useLimiter';
-import {showToast} from '../../../admin-x-ds/global/Toast';
+import {Modal, Radio, TextField, showToast} from '@tryghost/admin-x-design-system';
 import {useAddInvite, useBrowseInvites} from '../../../api/invites';
 import {useBrowseRoles} from '../../../api/roles';
 import {useBrowseUsers} from '../../../api/users';
@@ -179,9 +176,9 @@ const InviteUserModal = NiceModal.create(() => {
             }}
             cancelLabel=''
             okLabel={okLabel}
-            size={540}
             testId='invite-user-modal'
             title='Invite a new staff user'
+            width={540}
             onOk={handleSendInvitation}
         >
             <div className='flex flex-col gap-6 py-4'>
diff --git a/apps/admin-x-settings/src/components/settings/general/LockSite.tsx b/apps/admin-x-settings/src/components/settings/general/LockSite.tsx
index 481e69091ce..927fc7e93a3 100644
--- a/apps/admin-x-settings/src/components/settings/general/LockSite.tsx
+++ b/apps/admin-x-settings/src/components/settings/general/LockSite.tsx
@@ -1,13 +1,8 @@
-import Icon from '../../../admin-x-ds/global/Icon';
-import Link from '../../../admin-x-ds/global/Link';
 import React from 'react';
-import SettingGroup from '../../../admin-x-ds/settings/SettingGroup';
-import SettingGroupContent from '../../../admin-x-ds/settings/SettingGroupContent';
-import TextField from '../../../admin-x-ds/global/form/TextField';
-import Toggle from '../../../admin-x-ds/global/form/Toggle';
+import TopLevelGroup from '../../TopLevelGroup';
 import useSettingGroup from '../../../hooks/useSettingGroup';
+import {Icon, Link, SettingGroupContent, TextField, Toggle, withErrorBoundary} from '@tryghost/admin-x-design-system';
 import {getSettingValues} from '../../../api/settings';
-import {withErrorBoundary} from '../../../admin-x-ds/global/ErrorBoundary';
 
 const LockSite: React.FC<{ keywords: string[] }> = ({keywords}) => {
     const {
@@ -92,7 +87,7 @@ const LockSite: React.FC<{ keywords: string[] }> = ({keywords}) => {
     );
 
     return (
-        <SettingGroup
+        <TopLevelGroup
             description='Enable protection with a simple shared password.'
             isEditing={isEditing}
             keywords={keywords}
@@ -105,7 +100,7 @@ const LockSite: React.FC<{ keywords: string[] }> = ({keywords}) => {
             onSave={handleSave}
         >
             {isEditing ? inputs : values}
-        </SettingGroup>
+        </TopLevelGroup>
     );
 };
 
diff --git a/apps/admin-x-settings/src/components/settings/general/Metadata.tsx b/apps/admin-x-settings/src/components/settings/general/Metadata.tsx
index f78ce8dc8ea..d9547ab3366 100644
--- a/apps/admin-x-settings/src/components/settings/general/Metadata.tsx
+++ b/apps/admin-x-settings/src/components/settings/general/Metadata.tsx
@@ -1,13 +1,8 @@
-import Heading from '../../../admin-x-ds/global/Heading';
 import React from 'react';
-import SettingGroup from '../../../admin-x-ds/settings/SettingGroup';
-import SettingGroupContent from '../../../admin-x-ds/settings/SettingGroupContent';
-import TextField from '../../../admin-x-ds/global/form/TextField';
+import TopLevelGroup from '../../TopLevelGroup';
 import useSettingGroup from '../../../hooks/useSettingGroup';
-import {ReactComponent as GoogleLogo} from '../../../admin-x-ds/assets/images/google-logo.svg';
-import {ReactComponent as MagnifyingGlass} from '../../../admin-x-ds/assets/icons/magnifying-glass.svg';
+import {GoogleLogo, Heading, Icon, SettingGroupContent, TextField, withErrorBoundary} from '@tryghost/admin-x-design-system';
 import {getSettingValues} from '../../../api/settings';
-import {withErrorBoundary} from '../../../admin-x-ds/global/ErrorBoundary';
 
 interface SearchEnginePreviewProps {
     title: string;
@@ -34,7 +29,7 @@ const SearchEnginePreview: React.FC<SearchEnginePreviewProps> = ({
                 </div>
                 <div className='grow'>
                     <div className='flex w-full items-center justify-end rounded-full bg-white p-3 px-4 shadow dark:bg-grey-900'>
-                        <MagnifyingGlass className='h-4 w-4 text-blue-600' style={{strokeWidth: '2px'}} />
+                        <Icon className='stroke-[2px] text-blue-600' name='magnifying-glass' size='sm' />
                     </div>
                 </div>
             </div>
@@ -100,7 +95,7 @@ const Metadata: React.FC<{ keywords: string[] }> = ({keywords}) => {
     );
 
     return (
-        <SettingGroup
+        <TopLevelGroup
             description='Extra content for search engines'
             isEditing={isEditing}
             keywords={keywords}
@@ -123,7 +118,7 @@ const Metadata: React.FC<{ keywords: string[] }> = ({keywords}) => {
                 {inputFields}
             </>
             }
-        </SettingGroup>
+        </TopLevelGroup>
     );
 };
 
diff --git a/apps/admin-x-settings/src/components/settings/general/PublicationLanguage.tsx b/apps/admin-x-settings/src/components/settings/general/PublicationLanguage.tsx
index 3faf98252eb..0759e283888 100644
--- a/apps/admin-x-settings/src/components/settings/general/PublicationLanguage.tsx
+++ b/apps/admin-x-settings/src/components/settings/general/PublicationLanguage.tsx
@@ -1,10 +1,8 @@
 import React from 'react';
-import SettingGroup from '../../../admin-x-ds/settings/SettingGroup';
-import SettingGroupContent from '../../../admin-x-ds/settings/SettingGroupContent';
-import TextField from '../../../admin-x-ds/global/form/TextField';
+import TopLevelGroup from '../../TopLevelGroup';
 import useSettingGroup from '../../../hooks/useSettingGroup';
+import {SettingGroupContent, TextField, withErrorBoundary} from '@tryghost/admin-x-design-system';
 import {getSettingValues} from '../../../api/settings';
-import {withErrorBoundary} from '../../../admin-x-ds/global/ErrorBoundary';
 
 const PublicationLanguage: React.FC<{ keywords: string[] }> = ({keywords}) => {
     const {
@@ -55,7 +53,7 @@ const PublicationLanguage: React.FC<{ keywords: string[] }> = ({keywords}) => {
     );
 
     return (
-        <SettingGroup
+        <TopLevelGroup
             description="Set the language/locale which is used on your site"
             isEditing={isEditing}
             keywords={keywords}
@@ -68,7 +66,7 @@ const PublicationLanguage: React.FC<{ keywords: string[] }> = ({keywords}) => {
             onSave={handleSave}
         >
             {isEditing ? inputFields : values}
-        </SettingGroup>
+        </TopLevelGroup>
     );
 };
 
diff --git a/apps/admin-x-settings/src/components/settings/general/SocialAccounts.tsx b/apps/admin-x-settings/src/components/settings/general/SocialAccounts.tsx
index 2ba0b0bb025..5f13d55a067 100644
--- a/apps/admin-x-settings/src/components/settings/general/SocialAccounts.tsx
+++ b/apps/admin-x-settings/src/components/settings/general/SocialAccounts.tsx
@@ -1,11 +1,9 @@
 import React, {useState} from 'react';
-import SettingGroup from '../../../admin-x-ds/settings/SettingGroup';
-import SettingGroupContent from '../../../admin-x-ds/settings/SettingGroupContent';
-import TextField from '../../../admin-x-ds/global/form/TextField';
+import TopLevelGroup from '../../TopLevelGroup';
 import useSettingGroup from '../../../hooks/useSettingGroup';
+import {SettingGroupContent, TextField, withErrorBoundary} from '@tryghost/admin-x-design-system';
 import {facebookHandleToUrl, facebookUrlToHandle, twitterHandleToUrl, twitterUrlToHandle, validateFacebookUrl, validateTwitterUrl} from '../../../utils/socialUrls';
 import {getSettingValues} from '../../../api/settings';
-import {withErrorBoundary} from '../../../admin-x-ds/global/ErrorBoundary';
 
 const SocialAccounts: React.FC<{ keywords: string[] }> = ({keywords}) => {
     const {
@@ -103,7 +101,7 @@ const SocialAccounts: React.FC<{ keywords: string[] }> = ({keywords}) => {
     );
 
     return (
-        <SettingGroup
+        <TopLevelGroup
             description='Link your social accounts for full structured data and rich card support'
             isEditing={isEditing}
             keywords={keywords}
@@ -141,7 +139,7 @@ const SocialAccounts: React.FC<{ keywords: string[] }> = ({keywords}) => {
             }}
         >
             {isEditing ? inputs : values}
-        </SettingGroup>
+        </TopLevelGroup>
     );
 };
 
diff --git a/apps/admin-x-settings/src/components/settings/general/TimeZone.tsx b/apps/admin-x-settings/src/components/settings/general/TimeZone.tsx
index 8a440061c40..aab2ab757f7 100644
--- a/apps/admin-x-settings/src/components/settings/general/TimeZone.tsx
+++ b/apps/admin-x-settings/src/components/settings/general/TimeZone.tsx
@@ -1,12 +1,10 @@
 import React, {useEffect, useState} from 'react';
-import Select from '../../../admin-x-ds/global/form/Select';
-import SettingGroup from '../../../admin-x-ds/settings/SettingGroup';
-import SettingGroupContent from '../../../admin-x-ds/settings/SettingGroupContent';
+import TopLevelGroup from '../../TopLevelGroup';
 import timezoneData from '@tryghost/timezone-data';
 import useSettingGroup from '../../../hooks/useSettingGroup';
+import {Select, SettingGroupContent, withErrorBoundary} from '@tryghost/admin-x-design-system';
 import {getLocalTime} from '../../../utils/helpers';
 import {getSettingValues} from '../../../api/settings';
-import {withErrorBoundary} from '../../../admin-x-ds/global/ErrorBoundary';
 
 interface TimezoneDataDropdownOption {
     name: string;
@@ -88,7 +86,7 @@ const TimeZone: React.FC<{ keywords: string[] }> = ({keywords}) => {
     );
 
     return (
-        <SettingGroup
+        <TopLevelGroup
             description='Set the time and date of your publication, used for all published posts'
             isEditing={isEditing}
             keywords={keywords}
@@ -101,7 +99,7 @@ const TimeZone: React.FC<{ keywords: string[] }> = ({keywords}) => {
             onSave={handleSave}
         >
             {isEditing ? inputFields : viewContent}
-        </SettingGroup>
+        </TopLevelGroup>
     );
 };
 
diff --git a/apps/admin-x-settings/src/components/settings/general/TitleAndDescription.tsx b/apps/admin-x-settings/src/components/settings/general/TitleAndDescription.tsx
index 7e357c12dfe..a623e46bcd0 100644
--- a/apps/admin-x-settings/src/components/settings/general/TitleAndDescription.tsx
+++ b/apps/admin-x-settings/src/components/settings/general/TitleAndDescription.tsx
@@ -1,10 +1,8 @@
 import React from 'react';
-import SettingGroup from '../../../admin-x-ds/settings/SettingGroup';
-import SettingGroupContent from '../../../admin-x-ds/settings/SettingGroupContent';
-import TextField from '../../../admin-x-ds/global/form/TextField';
+import TopLevelGroup from '../../TopLevelGroup';
 import useSettingGroup from '../../../hooks/useSettingGroup';
+import {SettingGroupContent, TextField, withErrorBoundary} from '@tryghost/admin-x-design-system';
 import {getSettingValues} from '../../../api/settings';
-import {withErrorBoundary} from '../../../admin-x-ds/global/ErrorBoundary';
 
 const TitleAndDescription: React.FC<{ keywords: string[] }> = ({keywords}) => {
     const {
@@ -66,7 +64,7 @@ const TitleAndDescription: React.FC<{ keywords: string[] }> = ({keywords}) => {
     );
 
     return (
-        <SettingGroup
+        <TopLevelGroup
             description='The details used to identify your publication around the web'
             isEditing={isEditing}
             keywords={keywords}
@@ -79,7 +77,7 @@ const TitleAndDescription: React.FC<{ keywords: string[] }> = ({keywords}) => {
             onSave={handleSave}
         >
             {isEditing ? inputFields : values}
-        </SettingGroup>
+        </TopLevelGroup>
     );
 };
 
diff --git a/apps/admin-x-settings/src/components/settings/general/Twitter.tsx b/apps/admin-x-settings/src/components/settings/general/Twitter.tsx
index 807ba85ee6e..914ea756a5a 100644
--- a/apps/admin-x-settings/src/components/settings/general/Twitter.tsx
+++ b/apps/admin-x-settings/src/components/settings/general/Twitter.tsx
@@ -1,15 +1,11 @@
-import ImageUpload from '../../../admin-x-ds/global/form/ImageUpload';
 import React from 'react';
-import SettingGroup from '../../../admin-x-ds/settings/SettingGroup';
-import SettingGroupContent from '../../../admin-x-ds/settings/SettingGroupContent';
-import TextField from '../../../admin-x-ds/global/form/TextField';
+import TopLevelGroup from '../../TopLevelGroup';
 import useHandleError from '../../../utils/api/handleError';
 import usePinturaEditor from '../../../hooks/usePinturaEditor';
 import useSettingGroup from '../../../hooks/useSettingGroup';
-import {ReactComponent as TwitterLogo} from '../../../admin-x-ds/assets/images/x-logo.svg';
+import {ImageUpload, SettingGroupContent, TextField, TwitterLogo, withErrorBoundary} from '@tryghost/admin-x-design-system';
 import {getImageUrl, useUploadImage} from '../../../api/images';
 import {getSettingValues} from '../../../api/settings';
-import {withErrorBoundary} from '../../../admin-x-ds/global/ErrorBoundary';
 
 const Twitter: React.FC<{ keywords: string[] }> = ({keywords}) => {
     const {
@@ -26,15 +22,7 @@ const Twitter: React.FC<{ keywords: string[] }> = ({keywords}) => {
 
     const {mutateAsync: uploadImage} = useUploadImage();
 
-    const [pinturaJsUrl] = getSettingValues<string>(localSettings, ['pintura_js_url']);
-    const [pinturaCssUrl] = getSettingValues<string>(localSettings, ['pintura_css_url']);
-
-    const editor = usePinturaEditor(
-        {config: {
-            jsUrl: pinturaJsUrl || '',
-            cssUrl: pinturaCssUrl || ''
-        }}
-    );
+    const editor = usePinturaEditor();
 
     const [
         twitterTitle, twitterDescription, twitterImage, siteTitle, siteDescription
@@ -121,7 +109,7 @@ const Twitter: React.FC<{ keywords: string[] }> = ({keywords}) => {
     );
 
     return (
-        <SettingGroup
+        <TopLevelGroup
             description='Customize structured data of your site for X (formerly Twitter)'
             isEditing={isEditing}
             keywords={keywords}
@@ -135,7 +123,7 @@ const Twitter: React.FC<{ keywords: string[] }> = ({keywords}) => {
         >
             {values}
             {isEditing ? inputFields : null}
-        </SettingGroup>
+        </TopLevelGroup>
     );
 };
 
diff --git a/apps/admin-x-settings/src/components/settings/general/UserDetailModal.tsx b/apps/admin-x-settings/src/components/settings/general/UserDetailModal.tsx
index 11e3f9c6e2e..9a06c2ae817 100644
--- a/apps/admin-x-settings/src/components/settings/general/UserDetailModal.tsx
+++ b/apps/admin-x-settings/src/components/settings/general/UserDetailModal.tsx
@@ -1,38 +1,89 @@
 import ChangePasswordForm from './users/ChangePasswordForm';
-import ConfirmationModal from '../../../admin-x-ds/global/modal/ConfirmationModal';
 import EmailNotifications from './users/EmailNotifications';
-import Heading from '../../../admin-x-ds/global/Heading';
-import Icon from '../../../admin-x-ds/global/Icon';
-import ImageUpload from '../../../admin-x-ds/global/form/ImageUpload';
-import LimitModal from '../../../admin-x-ds/global/modal/LimitModal';
-import Menu, {MenuItem} from '../../../admin-x-ds/global/Menu';
-import Modal from '../../../admin-x-ds/global/modal/Modal';
 import NiceModal, {useModal} from '@ebay/nice-modal-react';
 import ProfileBasics from './users/ProfileBasics';
 import ProfileDetails from './users/ProfileDetails';
-import React, {useCallback, useEffect, useState} from 'react';
+import React, {useCallback, useEffect} from 'react';
 import StaffToken from './users/StaffToken';
 import clsx from 'clsx';
+import useForm, {ErrorMessages} from '../../../hooks/useForm';
 import useHandleError from '../../../utils/api/handleError';
 import usePinturaEditor from '../../../hooks/usePinturaEditor';
 import useRouting from '../../../hooks/useRouting';
 import useStaffUsers from '../../../hooks/useStaffUsers';
 import validator from 'validator';
+import {ConfirmationModal, Heading, Icon, ImageUpload, LimitModal, Menu, MenuItem, Modal, showToast} from '@tryghost/admin-x-design-system';
 import {HostLimitError, useLimiter} from '../../../hooks/useLimiter';
 import {RoutingModalProps} from '../../providers/RoutingProvider';
 import {User, canAccessSettings, hasAdminAccess, isAdminUser, isAuthorOrContributor, isEditorUser, isOwnerUser, useDeleteUser, useEditUser, useMakeOwner} from '../../../api/users';
 import {getImageUrl, useUploadImage} from '../../../api/images';
-import {getSettingValues} from '../../../api/settings';
-import {showToast} from '../../../admin-x-ds/global/Toast';
 import {toast} from 'react-hot-toast';
 import {useGlobalData} from '../../providers/GlobalDataProvider';
 import {validateFacebookUrl, validateTwitterUrl} from '../../../utils/socialUrls';
 
+const validators: Record<string, (u: Partial<User>) => string> = {
+    name: ({name}) => {
+        let error = '';
+
+        if (!name) {
+            error = 'Please enter a name';
+        }
+
+        if (name && name.length > 191) {
+            error = 'Name is too long';
+        }
+
+        return error;
+    },
+    email: ({email}) => {
+        const valid = validator.isEmail(email || '');
+        return valid ? '' : 'Please enter a valid email address';
+    },
+    url: ({url}) => {
+        const valid = !url || validator.isURL(url);
+        return valid ? '' : 'Please enter a valid URL';
+    },
+    bio: ({bio}) => {
+        const valid = !bio || bio.length <= 200;
+        return valid ? '' : 'Bio is too long';
+    },
+    location: ({location}) => {
+        const valid = !location || location.length <= 150;
+        return valid ? '' : 'Location is too long';
+    },
+    website: ({website}) => {
+        const valid = !website || (validator.isURL(website) && website.length <= 2000);
+        return valid ? '' : 'Website is not a valid url';
+    },
+    facebook: ({facebook}) => {
+        try {
+            validateFacebookUrl(facebook || '');
+            return '';
+        } catch (e) {
+            if (e instanceof Error) {
+                return e.message;
+            }
+            return '';
+        }
+    },
+    twitter: ({twitter}) => {
+        try {
+            validateTwitterUrl(twitter || '');
+            return '';
+        } catch (e) {
+            if (e instanceof Error) {
+                return e.message;
+            }
+            return '';
+        }
+    }
+};
+
 export interface UserDetailProps {
     user: User;
     setUserData: (user: User) => void;
     errors: {[key in keyof User]?: string};
-    validators: Record<string, (user: Partial<User>) => boolean>;
+    validateField: <K extends keyof User>(key: K, value: User[K]) => boolean;
     clearError: (key: keyof User) => void;
 }
 
@@ -47,15 +98,39 @@ const UserDetailModalContent: React.FC<{user: User}> = ({user}) => {
     const {updateRoute} = useRouting();
     const {ownerUser} = useStaffUsers();
     const {currentUser} = useGlobalData();
-    const [userData, _setUserData] = useState(user);
-    const [saveState, setSaveState] = useState<'' | 'unsaved' | 'saving' | 'saved'>('');
-    const [errors, setErrors] = useState<UserDetailProps['errors']>({});
-
-    const clearError = (key: keyof User) => setErrors(errs => ({...errs, [key]: undefined}));
-
-    const setUserData = (newUserData: User | ((current: User) => User)) => {
-        _setUserData(newUserData);
-        setSaveState('unsaved');
+    const handleError = useHandleError();
+    const {formState, setFormState, saveState, handleSave, updateForm, errors, setErrors, clearError, okProps} = useForm({
+        initialState: user,
+        savingDelay: 500,
+        savedDelay: 500,
+        onValidate: (values) => {
+            return Object.entries(validators).reduce<ErrorMessages>((newErrors, [key, validate]) => {
+                const error = validate(values);
+                if (error) {
+                    newErrors[key] = error;
+                }
+                return newErrors;
+            }, {});
+        },
+        onSave: async (values) => {
+            await updateUser?.(values);
+        },
+        onSavedStateReset: () => {
+            mainModal.remove();
+            navigateOnClose();
+        },
+        onSaveError: handleError
+    });
+    const setUserData = (newData: User) => updateForm(() => newData);
+    const validateField = <K extends keyof User>(key: K, value: User[K]) => {
+        const error = validators[key]?.({[key]: value});
+        if (error) {
+            setErrors({...errors, [key]: error});
+            return false;
+        } else {
+            clearError(key);
+            return true;
+        }
     };
 
     const mainModal = useModal();
@@ -64,19 +139,9 @@ const UserDetailModalContent: React.FC<{user: User}> = ({user}) => {
     const {mutateAsync: deleteUser} = useDeleteUser();
     const {mutateAsync: makeOwner} = useMakeOwner();
     const limiter = useLimiter();
-    const handleError = useHandleError();
 
     // Pintura integration
-    const {settings} = useGlobalData();
-    const [pinturaJsUrl] = getSettingValues<string>(settings, ['pintura_js_url']);
-    const [pinturaCssUrl] = getSettingValues<string>(settings, ['pintura_css_url']);
-
-    const editor = usePinturaEditor(
-        {config: {
-            jsUrl: pinturaJsUrl || '',
-            cssUrl: pinturaCssUrl || ''
-        }}
-    );
+    const editor = usePinturaEditor();
 
     const navigateOnClose = useCallback(() => {
         if (canAccessSettings(currentUser)) {
@@ -86,15 +151,6 @@ const UserDetailModalContent: React.FC<{user: User}> = ({user}) => {
         }
     }, [currentUser, updateRoute]);
 
-    useEffect(() => {
-        if (saveState === 'saved') {
-            setTimeout(() => {
-                mainModal.remove();
-                navigateOnClose();
-            }, 300);
-        }
-    }, [mainModal, navigateOnClose, saveState, updateRoute]);
-
     const confirmSuspend = async (_user: User) => {
         if (_user.status === 'inactive' && _user.roles[0].name !== 'Contributor') {
             try {
@@ -133,7 +189,7 @@ const UserDetailModalContent: React.FC<{user: User}> = ({user}) => {
                 };
                 try {
                     await updateUser(updatedUserData);
-                    setUserData(updatedUserData);
+                    setFormState(() => updatedUserData);
                     modal?.remove();
                     showToast({
                         message: _user.status === 'inactive' ? 'User un-suspended' : 'User suspended',
@@ -162,6 +218,7 @@ const UserDetailModalContent: React.FC<{user: User}> = ({user}) => {
                     await deleteUser(_user?.id);
                     modal?.remove();
                     mainModal?.remove();
+                    navigateOnClose();
                     showToast({
                         message: 'User deleted',
                         type: 'success'
@@ -200,12 +257,12 @@ const UserDetailModalContent: React.FC<{user: User}> = ({user}) => {
 
             switch (image) {
             case 'cover_image':
-                setUserData?.((_user) => {
+                updateForm((_user) => {
                     return {..._user, cover_image: imageUrl};
                 });
                 break;
             case 'profile_image':
-                setUserData?.((_user) => {
+                updateForm((_user) => {
                     return {..._user, profile_image: imageUrl};
                 });
                 break;
@@ -218,12 +275,12 @@ const UserDetailModalContent: React.FC<{user: User}> = ({user}) => {
     const handleImageDelete = (image: string) => {
         switch (image) {
         case 'cover_image':
-            setUserData?.((_user) => {
+            updateForm((_user) => {
                 return {..._user, cover_image: ''};
             });
             break;
         case 'profile_image':
-            setUserData?.((_user) => {
+            updateForm((_user) => {
                 return {..._user, profile_image: ''};
             });
             break;
@@ -233,7 +290,7 @@ const UserDetailModalContent: React.FC<{user: User}> = ({user}) => {
     const showMenu = hasAdminAccess(currentUser) || (isEditorUser(currentUser) && isAuthorOrContributor(user));
     let menuItems: MenuItem[] = [];
 
-    if (isOwnerUser(currentUser) && isAdminUser(userData) && userData.status !== 'inactive') {
+    if (isOwnerUser(currentUser) && isAdminUser(formState) && formState.status !== 'inactive') {
         menuItems.push({
             id: 'make-owner',
             label: 'Make owner',
@@ -241,11 +298,11 @@ const UserDetailModalContent: React.FC<{user: User}> = ({user}) => {
         });
     }
 
-    if (userData.id !== currentUser.id && (
+    if (formState.id !== currentUser.id && (
         (hasAdminAccess(currentUser) && !isOwnerUser(user)) ||
         (isEditorUser(currentUser) && isAuthorOrContributor(user))
     )) {
-        let suspendUserLabel = userData.status === 'inactive' ? 'Un-suspend user' : 'Suspend user';
+        let suspendUserLabel = formState.status === 'inactive' ? 'Un-suspend user' : 'Suspend user';
 
         menuItems.push({
             id: 'delete-user',
@@ -257,7 +314,7 @@ const UserDetailModalContent: React.FC<{user: User}> = ({user}) => {
             id: 'suspend-user',
             label: suspendUserLabel,
             onClick: () => {
-                confirmSuspend(userData);
+                confirmSuspend(formState);
             }
         });
     }
@@ -267,18 +324,10 @@ const UserDetailModalContent: React.FC<{user: User}> = ({user}) => {
         label: 'View user activity',
         onClick: () => {
             mainModal.remove();
-            updateRoute(`history/view/${userData.id}`);
+            updateRoute(`history/view/${formState.id}`);
         }
     });
 
-    let okLabel = saveState === 'saved' ? 'Saved' : 'Save & close';
-
-    if (saveState === 'saving') {
-        okLabel = 'Saving...';
-    } else if (saveState === 'saved') {
-        okLabel = 'Saved';
-    }
-
     const coverEditButtonBaseClasses = 'bg-[rgba(0,0,0,0.75)] rounded text-sm text-white flex items-center justify-center px-3 h-8 opacity-80 hover:opacity-100 transition-all cursor-pointer font-medium nowrap';
 
     const fileUploadButtonClasses = clsx(
@@ -293,122 +342,35 @@ const UserDetailModalContent: React.FC<{user: User}> = ({user}) => {
         coverEditButtonBaseClasses
     );
 
-    const suspendedText = userData.status === 'inactive' ? ' (Suspended)' : '';
-
-    const validators: Record<string, (u: Partial<User>) => boolean> = {
-        name: ({name}) => {
-            let error = '';
-
-            if (!name) {
-                error = 'Please enter a name';
-            }
-
-            if (name && name.length > 191) {
-                error = 'Name is too long';
-            }
-
-            setErrors?.((_errors) => {
-                return {..._errors, name: error};
-            });
-            return !error;
-        },
-        email: ({email}) => {
-            const valid = validator.isEmail(email || '');
-            setErrors?.((_errors) => {
-                return {..._errors, email: valid ? '' : 'Please enter a valid email address'};
-            });
-            return valid;
-        },
-        url: ({url}) => {
-            const valid = !url || validator.isURL(url);
-            setErrors?.((_errors) => {
-                return {..._errors, url: valid ? '' : 'Please enter a valid URL'};
-            });
-            return valid;
-        },
-        bio: ({bio}) => {
-            const valid = !bio || bio.length <= 200;
-            setErrors?.((_errors) => {
-                return {..._errors, bio: valid ? '' : 'Bio is too long'};
-            });
-            return valid;
-        },
-        location: ({location}) => {
-            const valid = !location || location.length <= 150;
-            setErrors?.((_errors) => {
-                return {..._errors, location: valid ? '' : 'Location is too long'};
-            });
-            return valid;
-        },
-        website: ({website}) => {
-            const valid = !website || (validator.isURL(website) && website.length <= 2000);
-            setErrors?.((_errors) => {
-                return {..._errors, website: valid ? '' : 'Website is not a valid url'};
-            });
-            return valid;
-        },
-        facebook: ({facebook}) => {
-            try {
-                validateFacebookUrl(facebook || '');
-                return true;
-            } catch (e) {
-                if (e instanceof Error) {
-                    const message = e.message;
-                    setErrors?.(_errors => ({..._errors, facebook: message}));
-                }
-                return false;
-            }
-        },
-        twitter: ({twitter}) => {
-            try {
-                validateTwitterUrl(twitter || '');
-                return true;
-            } catch (e) {
-                if (e instanceof Error) {
-                    const message = e.message;
-                    setErrors?.(_errors => ({..._errors, twitter: message}));
-                }
-                return false;
-            }
-        }
-    };
+    const suspendedText = formState.status === 'inactive' ? ' (Suspended)' : '';
 
     return (
         <Modal
             afterClose={navigateOnClose}
             animate={canAccessSettings(currentUser)}
             backDrop={canAccessSettings(currentUser)}
+            buttonsDisabled={okProps.disabled}
             dirty={saveState === 'unsaved'}
-            okLabel={okLabel}
+            okColor={okProps.color}
+            okLabel={okProps.label || 'Save & close'}
             size={canAccessSettings(currentUser) ? 'lg' : 'bleed'}
             stickyFooter={true}
             testId='user-detail-modal'
             onOk={async () => {
-                setSaveState('saving');
-                let isValid = true;
-                if (Object.values(validators).map(validate => validate(userData)).includes(false)) {
-                    isValid = false;
-                }
-
                 toast.remove();
 
-                if (!isValid) {
+                if (!(await handleSave({fakeWhenUnchanged: true}))) {
                     showToast({
                         type: 'pageError',
                         message: 'Can\'t save user, please double check that you\'ve filled all mandatory fields.'
                     });
-                    setSaveState('');
-                    return;
                 }
-
-                await updateUser?.(userData);
-                setSaveState('saved');
             }}
         >
             <div>
                 <div className={`relative ${canAccessSettings(currentUser) ? '-mx-8 -mt-8 rounded-t' : '-mx-10 -mt-10'} bg-gradient-to-tr from-grey-900 to-black`}>
                     <div className='flex min-h-[40vmin] flex-wrap items-end justify-between bg-cover bg-center' style={{
-                        backgroundImage: `url(${userData.cover_image})`
+                        backgroundImage: `url(${formState.cover_image})`
                     }}>
                         <div className='flex w-full max-w-[620px] flex-col gap-5 p-8 md:max-w-[auto] md:flex-row md:items-center'>
                             <div>
@@ -421,12 +383,12 @@ const UserDetailModalContent: React.FC<{user: User}> = ({user}) => {
                                     id='avatar'
                                     imageClassName='w-full h-full object-cover rounded-full shrink-0'
                                     imageContainerClassName='relative group bg-cover bg-center -ml-2 h-[80px] w-[80px] shrink-0'
-                                    imageURL={userData.profile_image}
+                                    imageURL={formState.profile_image}
                                     pintura={
                                         {
                                             isEnabled: editor.isEnabled,
                                             openEditor: async () => editor.openEditor({
-                                                image: userData.profile_image || '',
+                                                image: formState.profile_image || '',
                                                 handleSave: async (file:File) => {
                                                     handleImageUpload('profile_image', file);
                                                 }
@@ -459,12 +421,12 @@ const UserDetailModalContent: React.FC<{user: User}> = ({user}) => {
                                 fileUploadClassName={fileUploadButtonClasses}
                                 id='cover-image'
                                 imageClassName='hidden'
-                                imageURL={userData.cover_image || ''}
+                                imageURL={formState.cover_image || ''}
                                 pintura={
                                     {
                                         isEnabled: editor.isEnabled,
                                         openEditor: async () => editor.openEditor({
-                                            image: userData.cover_image || '',
+                                            image: formState.cover_image || '',
                                             handleSave: async (file:File) => {
                                                 handleImageUpload('cover_image', file);
                                             }
@@ -486,13 +448,13 @@ const UserDetailModalContent: React.FC<{user: User}> = ({user}) => {
                     </div>
                 </div>
                 <div className={`${!canAccessSettings(currentUser) && 'mx-auto max-w-4xl'} mt-10 grid grid-cols-1 gap-x-12 gap-y-20 md:grid-cols-2`}>
-                    <ProfileBasics clearError={clearError} errors={errors} setUserData={setUserData} user={userData} validators={validators} />
+                    <ProfileBasics clearError={clearError} errors={errors} setUserData={setUserData} user={formState} validateField={validateField} />
                     <div className='flex flex-col justify-between gap-10'>
-                        <ProfileDetails clearError={clearError} errors={errors} setUserData={setUserData} user={userData} validators={validators} />
+                        <ProfileDetails clearError={clearError} errors={errors} setUserData={setUserData} user={formState} validateField={validateField} />
                         {user.id === currentUser.id && <StaffToken />}
                     </div>
-                    <EmailNotifications setUserData={setUserData} user={userData} />
-                    <ChangePasswordForm user={userData} />
+                    <EmailNotifications setUserData={setUserData} user={formState} />
+                    <ChangePasswordForm user={formState} />
                 </div>
             </div>
         </Modal>
@@ -505,7 +467,7 @@ const UserDetailModal: React.FC<RoutingModalProps> = ({params}) => {
     const user = currentUser.slug === params?.slug ? currentUser : users.find(({slug}) => slug === params?.slug);
 
     useEffect(() => {
-        if (!user && !hasNextPage) {
+        if (!user && hasNextPage) {
             fetchNextPage();
         }
     }, [fetchNextPage, hasNextPage, user]);
diff --git a/apps/admin-x-settings/src/components/settings/general/Users.tsx b/apps/admin-x-settings/src/components/settings/general/Users.tsx
index 41d28b9b214..0f0ecaa09fd 100644
--- a/apps/admin-x-settings/src/components/settings/general/Users.tsx
+++ b/apps/admin-x-settings/src/components/settings/general/Users.tsx
@@ -1,21 +1,14 @@
-import Avatar from '../../../admin-x-ds/global/Avatar';
-import Button from '../../../admin-x-ds/global/Button';
-import List from '../../../admin-x-ds/global/List';
-import ListItem from '../../../admin-x-ds/global/ListItem';
-import NoValueLabel from '../../../admin-x-ds/global/NoValueLabel';
 import React, {useState} from 'react';
-import SettingGroup from '../../../admin-x-ds/settings/SettingGroup';
-import TabView from '../../../admin-x-ds/global/TabView';
+import TopLevelGroup from '../../TopLevelGroup';
 import clsx from 'clsx';
 import useHandleError from '../../../utils/api/handleError';
 import useRouting from '../../../hooks/useRouting';
 import useStaffUsers from '../../../hooks/useStaffUsers';
+import {Avatar, Button, List, ListItem, NoValueLabel, TabView, showToast, withErrorBoundary} from '@tryghost/admin-x-design-system';
 import {User, hasAdminAccess, isContributorUser, isEditorUser} from '../../../api/users';
 import {UserInvite, useAddInvite, useDeleteInvite} from '../../../api/invites';
 import {generateAvatarColor, getInitials} from '../../../utils/helpers';
-import {showToast} from '../../../admin-x-ds/global/Toast';
 import {useGlobalData} from '../../providers/GlobalDataProvider';
-import {withErrorBoundary} from '../../../admin-x-ds/global/ErrorBoundary';
 
 interface OwnerProps {
     user: User;
@@ -261,7 +254,7 @@ const Users: React.FC<{ keywords: string[], highlight?: boolean }> = ({keywords,
     ];
 
     return (
-        <SettingGroup
+        <TopLevelGroup
             customButtons={buttons}
             highlightOnModalClose={highlight}
             keywords={keywords}
@@ -276,7 +269,7 @@ const Users: React.FC<{ keywords: string[], highlight?: boolean }> = ({keywords,
                 link
                 onClick={() => fetchNextPage()}
             />}
-        </SettingGroup>
+        </TopLevelGroup>
     );
 };
 
diff --git a/apps/admin-x-settings/src/components/settings/general/users/ChangePasswordForm.tsx b/apps/admin-x-settings/src/components/settings/general/users/ChangePasswordForm.tsx
index b2245e10b76..381796ba0e8 100644
--- a/apps/admin-x-settings/src/components/settings/general/users/ChangePasswordForm.tsx
+++ b/apps/admin-x-settings/src/components/settings/general/users/ChangePasswordForm.tsx
@@ -1,11 +1,7 @@
-import Button from '../../../../admin-x-ds/global/Button';
-import Heading from '../../../../admin-x-ds/global/Heading';
-import SettingGroup from '../../../../admin-x-ds/settings/SettingGroup';
-import TextField from '../../../../admin-x-ds/global/form/TextField';
 import useHandleError from '../../../../utils/api/handleError';
+import {Button, Heading, SettingGroup, TextField, showToast} from '@tryghost/admin-x-design-system';
 import {User, useUpdatePassword} from '../../../../api/users';
 import {ValidationError} from '../../../../utils/errors';
-import {showToast} from '../../../../admin-x-ds/global/Toast';
 import {useEffect, useRef, useState} from 'react';
 import {useGlobalData} from '../../../providers/GlobalDataProvider';
 
diff --git a/apps/admin-x-settings/src/components/settings/general/users/CustomHeader.tsx b/apps/admin-x-settings/src/components/settings/general/users/CustomHeader.tsx
index 5629232dde1..4222e163a8c 100644
--- a/apps/admin-x-settings/src/components/settings/general/users/CustomHeader.tsx
+++ b/apps/admin-x-settings/src/components/settings/general/users/CustomHeader.tsx
@@ -1,4 +1,4 @@
-import Heading from '../../../../admin-x-ds/global/Heading';
+import {Heading} from '@tryghost/admin-x-design-system';
 
 const CustomHeader: React.FC<{
     children?: React.ReactNode;
diff --git a/apps/admin-x-settings/src/components/settings/general/users/EmailNotifications.tsx b/apps/admin-x-settings/src/components/settings/general/users/EmailNotifications.tsx
index d676433f63f..972a51d92d0 100644
--- a/apps/admin-x-settings/src/components/settings/general/users/EmailNotifications.tsx
+++ b/apps/admin-x-settings/src/components/settings/general/users/EmailNotifications.tsx
@@ -1,8 +1,6 @@
 import CustomHeader from './CustomHeader';
-import SettingGroup from '../../../../admin-x-ds/settings/SettingGroup';
-import SettingGroupContent from '../../../../admin-x-ds/settings/SettingGroupContent';
-import Toggle from '../../../../admin-x-ds/global/form/Toggle';
 import useFeatureFlag from '../../../../hooks/useFeatureFlag';
+import {SettingGroup, SettingGroupContent, Toggle} from '@tryghost/admin-x-design-system';
 import {User, hasAdminAccess} from '../../../../api/users';
 
 const EmailNotificationsInputs: React.FC<{ user: User; setUserData: (user: User) => void; }> = ({user, setUserData}) => {
diff --git a/apps/admin-x-settings/src/components/settings/general/users/ProfileBasics.tsx b/apps/admin-x-settings/src/components/settings/general/users/ProfileBasics.tsx
index d33c0a8b46a..ca6c8d5e0e0 100644
--- a/apps/admin-x-settings/src/components/settings/general/users/ProfileBasics.tsx
+++ b/apps/admin-x-settings/src/components/settings/general/users/ProfileBasics.tsx
@@ -1,13 +1,11 @@
 import CustomHeader from './CustomHeader';
 import RoleSelector from './RoleSelector';
-import SettingGroup from '../../../../admin-x-ds/settings/SettingGroup';
-import SettingGroupContent from '../../../../admin-x-ds/settings/SettingGroupContent';
-import TextField from '../../../../admin-x-ds/global/form/TextField';
+import {SettingGroup, SettingGroupContent, TextField} from '@tryghost/admin-x-design-system';
 import {UserDetailProps} from '../UserDetailModal';
 import {hasAdminAccess} from '../../../../api/users';
 import {useGlobalData} from '../../../providers/GlobalDataProvider';
 
-const BasicInputs: React.FC<UserDetailProps> = ({errors, validators, clearError, user, setUserData}) => {
+const BasicInputs: React.FC<UserDetailProps> = ({errors, validateField, clearError, user, setUserData}) => {
     const {currentUser} = useGlobalData();
 
     return (
@@ -18,7 +16,7 @@ const BasicInputs: React.FC<UserDetailProps> = ({errors, validators, clearError,
                 title="Full name"
                 value={user.name}
                 onBlur={(e) => {
-                    validators.name({name: e.target.value});
+                    validateField('name', e.target.value);
                 }}
                 onChange={(e) => {
                     setUserData({...user, name: e.target.value});
@@ -31,7 +29,7 @@ const BasicInputs: React.FC<UserDetailProps> = ({errors, validators, clearError,
                 title="Email"
                 value={user.email}
                 onBlur={(e) => {
-                    validators.email({email: e.target.value});
+                    validateField('email', e.target.value);
                 }}
                 onChange={(e) => {
                     setUserData({...user, email: e.target.value});
diff --git a/apps/admin-x-settings/src/components/settings/general/users/ProfileDetails.tsx b/apps/admin-x-settings/src/components/settings/general/users/ProfileDetails.tsx
index 9c336960095..fc9e51796be 100644
--- a/apps/admin-x-settings/src/components/settings/general/users/ProfileDetails.tsx
+++ b/apps/admin-x-settings/src/components/settings/general/users/ProfileDetails.tsx
@@ -1,13 +1,10 @@
 import CustomHeader from './CustomHeader';
-import SettingGroup from '../../../../admin-x-ds/settings/SettingGroup';
-import SettingGroupContent from '../../../../admin-x-ds/settings/SettingGroupContent';
-import TextArea from '../../../../admin-x-ds/global/form/TextArea';
-import TextField from '../../../../admin-x-ds/global/form/TextField';
+import {SettingGroup, SettingGroupContent, TextArea, TextField} from '@tryghost/admin-x-design-system';
 import {UserDetailProps} from '../UserDetailModal';
 import {facebookHandleToUrl, facebookUrlToHandle, twitterHandleToUrl, twitterUrlToHandle, validateFacebookUrl, validateTwitterUrl} from '../../../../utils/socialUrls';
 import {useState} from 'react';
 
-export const DetailsInputs: React.FC<UserDetailProps> = ({errors, clearError, validators, user, setUserData}) => {
+export const DetailsInputs: React.FC<UserDetailProps> = ({errors, clearError, validateField, user, setUserData}) => {
     const [facebookUrl, setFacebookUrl] = useState(user.facebook ? facebookHandleToUrl(user.facebook) : '');
     const [twitterUrl, setTwitterUrl] = useState(user.twitter ? twitterHandleToUrl(user.twitter) : '');
 
@@ -19,7 +16,7 @@ export const DetailsInputs: React.FC<UserDetailProps> = ({errors, clearError, va
                 title="Location"
                 value={user.location || ''}
                 onBlur={(e) => {
-                    validators.location({location: e.target.value});
+                    validateField('location', e.target.value);
                 }}
                 onChange={(e) => {
                     setUserData({...user, location: e.target.value});
@@ -31,7 +28,7 @@ export const DetailsInputs: React.FC<UserDetailProps> = ({errors, clearError, va
                 title="Website"
                 value={user.website || ''}
                 onBlur={(e) => {
-                    validators.url({url: e.target.value});
+                    validateField('url', e.target.value);
                 }}
                 onChange={(e) => {
                     setUserData({...user, website: e.target.value});
@@ -43,7 +40,7 @@ export const DetailsInputs: React.FC<UserDetailProps> = ({errors, clearError, va
                 title="Facebook profile"
                 value={facebookUrl}
                 onBlur={(e) => {
-                    if (validators.facebook({facebook: e.target.value})) {
+                    if (validateField('facebook', e.target.value)) {
                         const url = validateFacebookUrl(e.target.value);
                         setFacebookUrl(url);
                         setUserData({...user, facebook: facebookUrlToHandle(url)});
@@ -59,7 +56,7 @@ export const DetailsInputs: React.FC<UserDetailProps> = ({errors, clearError, va
                 title="X (formerly Twitter) profile"
                 value={twitterUrl}
                 onBlur={(e) => {
-                    if (validators.twitter({twitter: e.target.value})) {
+                    if (validateField('twitter', e.target.value)) {
                         const url = validateTwitterUrl(e.target.value);
                         setTwitterUrl(url);
                         setUserData({...user, twitter: twitterUrlToHandle(url)});
@@ -75,7 +72,7 @@ export const DetailsInputs: React.FC<UserDetailProps> = ({errors, clearError, va
                 title="Bio"
                 value={user.bio || ''}
                 onBlur={(e) => {
-                    validators.bio({bio: e.target.value});
+                    validateField('bio', e.target.value);
                 }}
                 onChange={(e) => {
                     setUserData({...user, bio: e.target.value});
diff --git a/apps/admin-x-settings/src/components/settings/general/users/RoleSelector.tsx b/apps/admin-x-settings/src/components/settings/general/users/RoleSelector.tsx
index f7c3e071825..e25450b4938 100644
--- a/apps/admin-x-settings/src/components/settings/general/users/RoleSelector.tsx
+++ b/apps/admin-x-settings/src/components/settings/general/users/RoleSelector.tsx
@@ -1,6 +1,4 @@
-import Heading from '../../../../admin-x-ds/global/Heading';
-import Icon from '../../../../admin-x-ds/global/Icon';
-import Radio from '../../../../admin-x-ds/global/form/Radio';
+import {Heading, Icon, Radio} from '@tryghost/admin-x-design-system';
 import {User, isOwnerUser} from '../../../../api/users';
 import {useBrowseRoles} from '../../../../api/roles';
 
diff --git a/apps/admin-x-settings/src/components/settings/general/users/StaffToken.tsx b/apps/admin-x-settings/src/components/settings/general/users/StaffToken.tsx
index b9cc8c52e6c..51590a2e624 100644
--- a/apps/admin-x-settings/src/components/settings/general/users/StaffToken.tsx
+++ b/apps/admin-x-settings/src/components/settings/general/users/StaffToken.tsx
@@ -1,8 +1,7 @@
 import APIKeys from '../../advanced/integrations/APIKeys';
-import ConfirmationModal from '../../../../admin-x-ds/global/modal/ConfirmationModal';
-import Heading from '../../../../admin-x-ds/global/Heading';
 import NiceModal from '@ebay/nice-modal-react';
 import useHandleError from '../../../../utils/api/handleError';
+import {ConfirmationModal, Heading} from '@tryghost/admin-x-design-system';
 import {genStaffToken, getStaffToken} from '../../../../api/staffToken';
 import {useEffect, useState} from 'react';
 
diff --git a/apps/admin-x-settings/src/components/settings/membership/Access.tsx b/apps/admin-x-settings/src/components/settings/membership/Access.tsx
index ad14d6060bb..04336cfd06b 100644
--- a/apps/admin-x-settings/src/components/settings/membership/Access.tsx
+++ b/apps/admin-x-settings/src/components/settings/membership/Access.tsx
@@ -1,14 +1,11 @@
-import MultiSelect, {MultiSelectOption} from '../../../admin-x-ds/global/form/MultiSelect';
 import React from 'react';
-import Select from '../../../admin-x-ds/global/form/Select';
-import SettingGroup from '../../../admin-x-ds/settings/SettingGroup';
-import SettingGroupContent from '../../../admin-x-ds/settings/SettingGroupContent';
+import TopLevelGroup from '../../TopLevelGroup';
 import useSettingGroup from '../../../hooks/useSettingGroup';
 import {GroupBase, MultiValue} from 'react-select';
+import {MultiSelect, MultiSelectOption, Select, SettingGroupContent, withErrorBoundary} from '@tryghost/admin-x-design-system';
 import {getOptionLabel} from '../../../utils/helpers';
 import {getSettingValues} from '../../../api/settings';
 import {useBrowseTiers} from '../../../api/tiers';
-import {withErrorBoundary} from '../../../admin-x-ds/global/ErrorBoundary';
 
 const MEMBERS_SIGNUP_ACCESS_OPTIONS = [
     {
@@ -178,7 +175,7 @@ const Access: React.FC<{ keywords: string[] }> = ({keywords}) => {
     );
 
     return (
-        <SettingGroup
+        <TopLevelGroup
             description='Set up default access options for subscription and posts'
             isEditing={isEditing}
             keywords={keywords}
@@ -191,7 +188,7 @@ const Access: React.FC<{ keywords: string[] }> = ({keywords}) => {
             onSave={handleSave}
         >
             {isEditing ? form : values}
-        </SettingGroup>
+        </TopLevelGroup>
     );
 };
 
diff --git a/apps/admin-x-settings/src/components/settings/membership/Analytics.tsx b/apps/admin-x-settings/src/components/settings/membership/Analytics.tsx
index 9cf589dc108..5908d12f964 100644
--- a/apps/admin-x-settings/src/components/settings/membership/Analytics.tsx
+++ b/apps/admin-x-settings/src/components/settings/membership/Analytics.tsx
@@ -1,12 +1,9 @@
-import Button from '../../../admin-x-ds/global/Button';
 import React from 'react';
-import SettingGroup from '../../../admin-x-ds/settings/SettingGroup';
-import SettingGroupContent from '../../../admin-x-ds/settings/SettingGroupContent';
-import Toggle from '../../../admin-x-ds/global/form/Toggle';
+import TopLevelGroup from '../../TopLevelGroup';
 import useSettingGroup from '../../../hooks/useSettingGroup';
+import {Button, SettingGroupContent, Toggle, withErrorBoundary} from '@tryghost/admin-x-design-system';
 import {getSettingValues} from '../../../api/settings';
 import {usePostsExports} from '../../../api/posts';
-import {withErrorBoundary} from '../../../admin-x-ds/global/ErrorBoundary';
 
 const Analytics: React.FC<{ keywords: string[] }> = ({keywords}) => {
     const {
@@ -84,7 +81,7 @@ const Analytics: React.FC<{ keywords: string[] }> = ({keywords}) => {
     );
 
     return (
-        <SettingGroup
+        <TopLevelGroup
             description='Decide what data you collect from your members'
             isEditing={isEditing}
             keywords={keywords}
@@ -102,7 +99,7 @@ const Analytics: React.FC<{ keywords: string[] }> = ({keywords}) => {
                 <Button color='green' label='Export' link linkWithPadding onClick={exportPosts} />
                 <a className='text-sm text-green' href="https://ghost.org/help/post-analytics/" rel="noopener noreferrer" target="_blank">Learn about analytics</a>
             </div>
-        </SettingGroup>
+        </TopLevelGroup>
     );
 };
 
diff --git a/apps/admin-x-settings/src/components/settings/membership/MembershipSettings.tsx b/apps/admin-x-settings/src/components/settings/membership/MembershipSettings.tsx
index f9aa40f4a77..256d274b6d7 100644
--- a/apps/admin-x-settings/src/components/settings/membership/MembershipSettings.tsx
+++ b/apps/admin-x-settings/src/components/settings/membership/MembershipSettings.tsx
@@ -1,30 +1,33 @@
 import Access from './Access';
 import Analytics from './Analytics';
 import EmbedSignupForm from './embedSignup/EmbedSignupForm';
+import Offers from './Offers';
 import Portal from './Portal';
 import React from 'react';
 import Recommendations from './Recommendations';
-import SettingSection from '../../../admin-x-ds/settings/SettingSection';
+import SearchableSection from '../../SearchableSection';
 import Tiers from './Tiers';
 import TipsOrDonations from './TipsOrDonations';
 import useFeatureFlag from '../../../hooks/useFeatureFlag';
 
 export const searchKeywords = {
-    portal: ['portal', 'signup', 'sign up', 'signin', 'sign in', 'login', 'account', 'membership'],
-    access: ['default', 'access', 'subscription', 'post', 'membership', 'comments', 'commenting'],
-    tiers: ['tiers', 'payment', 'paid', 'stripe'],
-    tips: ['tip', 'donation', 'one time', 'payment'],
-    embedSignupForm: ['embeddable signup form', 'embeddable form', 'embeddable sign up form', 'embeddable sign up'],
-    recommendations: ['recommendations', 'recommend', 'blogroll'],
-    analytics: ['analytics', 'tracking', 'privacy', 'membership']
+    portal: ['membership', 'portal', 'signup', 'sign up', 'signin', 'sign in', 'login', 'account', 'membership'],
+    access: ['membership', 'default', 'access', 'subscription', 'post', 'membership', 'comments', 'commenting'],
+    tiers: ['membership', 'tiers', 'payment', 'paid', 'stripe'],
+    tips: ['membership', 'tip', 'donation', 'one time', 'payment'],
+    embedSignupForm: ['membership', 'embeddable signup form', 'embeddable form', 'embeddable sign up form', 'embeddable sign up'],
+    recommendations: ['membership', 'recommendations', 'recommend', 'blogroll'],
+    analytics: ['membership', 'analytics', 'tracking', 'privacy', 'membership'],
+    offers: ['membership', 'offers', 'discounts', 'coupons', 'promotions']
 };
 
 const MembershipSettings: React.FC = () => {
     const hasTipsAndDonations = useFeatureFlag('tipsAndDonations');
     const hasRecommendations = useFeatureFlag('recommendations');
+    const hasOffers = useFeatureFlag('adminXOffers');
 
     return (
-        <SettingSection keywords={Object.values(searchKeywords).flat()} title='Membership'>
+        <SearchableSection keywords={Object.values(searchKeywords).flat()} title='Membership'>
             <Access keywords={searchKeywords.access} />
             <Portal keywords={searchKeywords.portal} />
             <Tiers keywords={searchKeywords.tiers} />
@@ -32,7 +35,8 @@ const MembershipSettings: React.FC = () => {
             <EmbedSignupForm keywords={searchKeywords.embedSignupForm} />
             {hasRecommendations && <Recommendations keywords={searchKeywords.recommendations} />}
             <Analytics keywords={searchKeywords.analytics} />
-        </SettingSection>
+            {hasOffers && <Offers keywords={searchKeywords.offers} />}
+        </SearchableSection>
     );
 };
 
diff --git a/apps/admin-x-settings/src/components/settings/membership/Offers.tsx b/apps/admin-x-settings/src/components/settings/membership/Offers.tsx
new file mode 100644
index 00000000000..18f99159150
--- /dev/null
+++ b/apps/admin-x-settings/src/components/settings/membership/Offers.tsx
@@ -0,0 +1,28 @@
+import React from 'react';
+import TopLevelGroup from '../../TopLevelGroup';
+import useRouting from '../../../hooks/useRouting';
+import {Button, withErrorBoundary} from '@tryghost/admin-x-design-system';
+import {checkStripeEnabled} from '../../../api/settings';
+import {useGlobalData} from '../../providers/GlobalDataProvider';
+
+const Offers: React.FC<{ keywords: string[] }> = ({keywords}) => {
+    const {updateRoute} = useRouting();
+    const {settings, config} = useGlobalData();
+
+    const openModal = () => {
+        updateRoute('offers/edit');
+    };
+
+    return (
+        <TopLevelGroup
+            customButtons={<Button color='green' disabled={!checkStripeEnabled(settings, config)} label='Manage offers' link linkWithPadding onClick={openModal}/>}
+            description={<>Grow your audience by providing fixed or percentage discounts. <a className='text-green' href="https://ghost.org/help/offers" rel="noopener noreferrer" target="_blank">Learn more</a></>}
+            keywords={keywords}
+            navid='offers'
+            testId='offers'
+            title='Offers'
+        />
+    );
+};
+
+export default withErrorBoundary(Offers, 'Portal settings');
diff --git a/apps/admin-x-settings/src/components/settings/membership/Portal.tsx b/apps/admin-x-settings/src/components/settings/membership/Portal.tsx
index ce488f50613..5b118130236 100644
--- a/apps/admin-x-settings/src/components/settings/membership/Portal.tsx
+++ b/apps/admin-x-settings/src/components/settings/membership/Portal.tsx
@@ -1,10 +1,9 @@
-import Button from '../../../admin-x-ds/global/Button';
 import React from 'react';
-import SettingGroup from '../../../admin-x-ds/settings/SettingGroup';
+import TopLevelGroup from '../../TopLevelGroup';
 import useRouting from '../../../hooks/useRouting';
+import {Button, withErrorBoundary} from '@tryghost/admin-x-design-system';
 import {getSettingValues} from '../../../api/settings';
 import {useGlobalData} from '../../providers/GlobalDataProvider';
-import {withErrorBoundary} from '../../../admin-x-ds/global/ErrorBoundary';
 
 const Portal: React.FC<{ keywords: string[] }> = ({keywords}) => {
     const {updateRoute} = useRouting();
@@ -16,7 +15,7 @@ const Portal: React.FC<{ keywords: string[] }> = ({keywords}) => {
     };
 
     return (
-        <SettingGroup
+        <TopLevelGroup
             customButtons={<Button color='green' disabled={membersSignupAccess === 'none'} label='Customize' link linkWithPadding onClick={openPreviewModal}/>}
             description="Customize members modal signup flow"
             keywords={keywords}
diff --git a/apps/admin-x-settings/src/components/settings/membership/Recommendations.tsx b/apps/admin-x-settings/src/components/settings/membership/Recommendations.tsx
index 69be9b9d47f..ed47c467459 100644
--- a/apps/admin-x-settings/src/components/settings/membership/Recommendations.tsx
+++ b/apps/admin-x-settings/src/components/settings/membership/Recommendations.tsx
@@ -1,15 +1,12 @@
-import Button from '../../../admin-x-ds/global/Button';
 import IncomingRecommendationList from './recommendations/IncomingRecommendationList';
 import React, {useState} from 'react';
 import RecommendationList from './recommendations/RecommendationList';
-import SettingGroup from '../../../admin-x-ds/settings/SettingGroup';
-import TabView from '../../../admin-x-ds/global/TabView';
+import TopLevelGroup from '../../TopLevelGroup';
 import useRouting from '../../../hooks/useRouting';
 import useSettingGroup from '../../../hooks/useSettingGroup';
-import {ShowMoreData} from '../../../admin-x-ds/global/Table';
+import {Button, ShowMoreData, TabView, withErrorBoundary} from '@tryghost/admin-x-design-system';
 import {useBrowseIncomingRecommendations, useBrowseRecommendations} from '../../../api/recommendations';
 import {useReferrerHistory} from '../../../api/referrers';
-import {withErrorBoundary} from '../../../admin-x-ds/global/ErrorBoundary';
 
 const Recommendations: React.FC<{ keywords: string[] }> = ({keywords}) => {
     const {
@@ -121,7 +118,7 @@ const Recommendations: React.FC<{ keywords: string[] }> = ({keywords}) => {
     );
 
     return (
-        <SettingGroup
+        <TopLevelGroup
             beta={true}
             customButtons={buttons}
             description={groupDescription}
@@ -138,7 +135,7 @@ const Recommendations: React.FC<{ keywords: string[] }> = ({keywords}) => {
                 }} />
             </div>
             <TabView selectedTab={selectedTab} tabs={tabs} onTabChange={setSelectedTab} />
-        </SettingGroup>
+        </TopLevelGroup>
     );
 };
 
diff --git a/apps/admin-x-settings/src/components/settings/membership/Tiers.tsx b/apps/admin-x-settings/src/components/settings/membership/Tiers.tsx
index 88eeb262906..ec27f1158b6 100644
--- a/apps/admin-x-settings/src/components/settings/membership/Tiers.tsx
+++ b/apps/admin-x-settings/src/components/settings/membership/Tiers.tsx
@@ -1,15 +1,12 @@
-import Button from '../../../admin-x-ds/global/Button';
 import React, {useState} from 'react';
-import SettingGroup from '../../../admin-x-ds/settings/SettingGroup';
-import StripeButton from '../../../admin-x-ds/settings/StripeButton';
-import TabView from '../../../admin-x-ds/global/TabView';
 import TiersList from './tiers/TiersList';
+import TopLevelGroup from '../../TopLevelGroup';
 import clsx from 'clsx';
 import useRouting from '../../../hooks/useRouting';
+import {Button, StripeButton, TabView, withErrorBoundary} from '@tryghost/admin-x-design-system';
 import {Tier, getActiveTiers, getArchivedTiers, useBrowseTiers} from '../../../api/tiers';
 import {checkStripeEnabled} from '../../../api/settings';
 import {useGlobalData} from '../../providers/GlobalDataProvider';
-import {withErrorBoundary} from '../../../admin-x-ds/global/ErrorBoundary';
 
 const StripeConnectedButton: React.FC<{className?: string; onClick: () => void;}> = ({className, onClick}) => {
     className = clsx(
@@ -61,7 +58,7 @@ const Tiers: React.FC<{ keywords: string[] }> = ({keywords}) => {
     }
 
     return (
-        <SettingGroup
+        <TopLevelGroup
             customButtons={checkStripeEnabled(settings, config) ?
                 <StripeConnectedButton className='hidden tablet:!visible tablet:!block' onClick={openConnectModal} />
                 :
@@ -86,7 +83,7 @@ const Tiers: React.FC<{ keywords: string[] }> = ({keywords}) => {
                 link
                 onClick={() => fetchNextPage()}
             />}
-        </SettingGroup>
+        </TopLevelGroup>
     );
 };
 
diff --git a/apps/admin-x-settings/src/components/settings/membership/TipsOrDonations.tsx b/apps/admin-x-settings/src/components/settings/membership/TipsOrDonations.tsx
index 57436f208f8..299b70f0af9 100644
--- a/apps/admin-x-settings/src/components/settings/membership/TipsOrDonations.tsx
+++ b/apps/admin-x-settings/src/components/settings/membership/TipsOrDonations.tsx
@@ -1,15 +1,9 @@
-import Button from '../../../admin-x-ds/global/Button';
-import CurrencyField from '../../../admin-x-ds/global/form/CurrencyField';
-import Heading from '../../../admin-x-ds/global/Heading';
 import React, {useEffect, useState} from 'react';
-import Select from '../../../admin-x-ds/global/form/Select';
-import SettingGroup from '../../../admin-x-ds/settings/SettingGroup';
-import SettingGroupContent from '../../../admin-x-ds/settings/SettingGroupContent';
+import TopLevelGroup from '../../TopLevelGroup';
 import useSettingGroup from '../../../hooks/useSettingGroup';
-import {confirmIfDirty} from '../../../utils/modals';
+import {Button, CurrencyField, Heading, Select, SettingGroupContent, confirmIfDirty, withErrorBoundary} from '@tryghost/admin-x-design-system';
 import {currencySelectGroups, getSymbol, validateCurrencyAmount} from '../../../utils/currency';
 import {getSettingValues} from '../../../api/settings';
-import {withErrorBoundary} from '../../../admin-x-ds/global/ErrorBoundary';
 
 // Stripe doesn't allow amounts over 10,000 as a preset amount
 const MAX_AMOUNT = 10_000;
@@ -122,7 +116,7 @@ const TipsOrDonations: React.FC<{ keywords: string[] }> = ({keywords}) => {
     );
 
     return (
-        <SettingGroup
+        <TopLevelGroup
             description="Give your audience a one-time way to support your work, no membership required."
             isEditing={isEditing}
             keywords={keywords}
@@ -135,7 +129,7 @@ const TipsOrDonations: React.FC<{ keywords: string[] }> = ({keywords}) => {
             onSave={handleSave}
         >
             {isEditing ? inputFields : values}
-        </SettingGroup>
+        </TopLevelGroup>
     );
 };
 
diff --git a/apps/admin-x-settings/src/components/settings/membership/embedSignup/EmbedSignupForm.tsx b/apps/admin-x-settings/src/components/settings/membership/embedSignup/EmbedSignupForm.tsx
index 6673a61f0d1..c6d2b03c85e 100644
--- a/apps/admin-x-settings/src/components/settings/membership/embedSignup/EmbedSignupForm.tsx
+++ b/apps/admin-x-settings/src/components/settings/membership/embedSignup/EmbedSignupForm.tsx
@@ -1,7 +1,7 @@
-import Button from '../../../../admin-x-ds/global/Button';
 import React from 'react';
-import SettingGroup from '../../../../admin-x-ds/settings/SettingGroup';
+import TopLevelGroup from '../../../TopLevelGroup';
 import useRouting from '../../../../hooks/useRouting';
+import {Button} from '@tryghost/admin-x-design-system';
 
 const EmbedSignupForm: React.FC<{ keywords: string[] }> = ({keywords}) => {
     const {updateRoute} = useRouting();
@@ -10,7 +10,7 @@ const EmbedSignupForm: React.FC<{ keywords: string[] }> = ({keywords}) => {
     };
 
     return (
-        <SettingGroup
+        <TopLevelGroup
             customButtons={<Button color='green' label='Embed' link onClick={openPreviewModal}/>}
             description="Grow your audience from anywhere on the web"
             keywords={keywords}
diff --git a/apps/admin-x-settings/src/components/settings/membership/embedSignup/EmbedSignupFormModal.tsx b/apps/admin-x-settings/src/components/settings/membership/embedSignup/EmbedSignupFormModal.tsx
index 3750f64163d..b5d0e7d0d1f 100644
--- a/apps/admin-x-settings/src/components/settings/membership/embedSignup/EmbedSignupFormModal.tsx
+++ b/apps/admin-x-settings/src/components/settings/membership/embedSignup/EmbedSignupFormModal.tsx
@@ -1,10 +1,9 @@
 import EmbedSignupPreview from './EmbedSignupPreview';
 import EmbedSignupSidebar, {SelectedLabelTypes} from './EmbedSignupSidebar';
-import Modal from '../../../../admin-x-ds/global/modal/Modal';
 import NiceModal from '@ebay/nice-modal-react';
 import useRouting from '../../../../hooks/useRouting';
 import useSettingGroup from '../../../../hooks/useSettingGroup';
-import {MultiSelectOption} from '../../../../admin-x-ds/global/form/MultiSelect';
+import {Modal, MultiSelectOption} from '@tryghost/admin-x-design-system';
 import {MultiValue} from 'react-select';
 import {generateCode} from '../../../../utils/generateEmbedCode';
 import {getSettingValues} from '../../../../api/settings';
@@ -90,12 +89,12 @@ const EmbedSignupFormModal = NiceModal.create(() => {
             }}
             cancelLabel=''
             footer={false}
-            maxHeight={645}
+            height={645}
             padding={false}
-            size={1120}
             testId='embed-signup-form'
             title=''
             topRightContent='close'
+            width={1120}
         >
             <div className='grid grid-cols-[5.2fr_2.8fr]'>
                 <EmbedSignupPreview
diff --git a/apps/admin-x-settings/src/components/settings/membership/embedSignup/EmbedSignupSidebar.tsx b/apps/admin-x-settings/src/components/settings/membership/embedSignup/EmbedSignupSidebar.tsx
index 04754981930..357e021483a 100644
--- a/apps/admin-x-settings/src/components/settings/membership/embedSignup/EmbedSignupSidebar.tsx
+++ b/apps/admin-x-settings/src/components/settings/membership/embedSignup/EmbedSignupSidebar.tsx
@@ -1,17 +1,8 @@
-import Button from '../../../../admin-x-ds/global/Button';
-import ColorIndicator from '../../../../admin-x-ds/global/form/ColorIndicator';
-import ColorPicker from '../../../../admin-x-ds/global/form/ColorPicker';
-import Form from '../../../../admin-x-ds/global/form/Form';
-import Heading from '../../../../admin-x-ds/global/Heading';
-import MultiSelect, {LoadOptions, MultiSelectOption} from '../../../../admin-x-ds/global/form/MultiSelect';
-import Radio from '../../../../admin-x-ds/global/form/Radio';
 import React from 'react';
-import StickyFooter from '../../../../admin-x-ds/global/StickyFooter';
-import TextArea from '../../../../admin-x-ds/global/form/TextArea';
 import useFilterableApi from '../../../../hooks/useFilterableApi';
+import {Button, ColorIndicator, ColorPicker, Form, Heading, LoadMultiSelectOptions, MultiSelect, MultiSelectOption, Radio, StickyFooter, TextArea, debounce} from '@tryghost/admin-x-design-system';
 import {Label} from '../../../../api/labels';
 import {MultiValue} from 'react-select';
-import {debounce} from '../../../../utils/debounce';
 
 export type SelectedLabelTypes = {
     label: string;
@@ -47,7 +38,7 @@ const EmbedSignupSidebar: React.FC<SidebarProps> = ({selectedLayout,
     isCopied}) => {
     const {loadData} = useFilterableApi<Label>({path: '/labels/', filterKey: 'name', responseKey: 'labels'});
 
-    const loadOptions: LoadOptions = async (input, callback) => {
+    const loadOptions: LoadMultiSelectOptions = async (input, callback) => {
         const labels = await loadData(input);
         callback(labels.map(label => ({label: label.name, value: label.name})));
     };
diff --git a/apps/admin-x-settings/src/components/settings/membership/offers/AddOfferModal.tsx b/apps/admin-x-settings/src/components/settings/membership/offers/AddOfferModal.tsx
new file mode 100644
index 00000000000..b6f5dd24838
--- /dev/null
+++ b/apps/admin-x-settings/src/components/settings/membership/offers/AddOfferModal.tsx
@@ -0,0 +1,168 @@
+import NiceModal, {useModal} from '@ebay/nice-modal-react';
+import PortalFrame from '../portal/PortalFrame';
+import useFeatureFlag from '../../../../hooks/useFeatureFlag';
+import useRouting from '../../../../hooks/useRouting';
+import {Form, Icon, PreviewModalContent, Select, TextArea, TextField} from '@tryghost/admin-x-design-system';
+import {getOfferPortalPreviewUrl, offerPortalPreviewUrlTypes} from '../../../../utils/getOffersPortalPreviewUrl';
+import {useEffect} from 'react';
+
+interface OfferType {
+    title: string;
+    description: string;
+}
+
+const ButtonSelect: React.FC<{type: OfferType, checked: boolean}> = ({type, checked}) => {
+    const checkboxClass = checked ? 'bg-black text-white' : 'border border-grey-300';
+
+    return (
+        <button className='text-left' type='button'>
+            <div className='flex gap-3'>
+                <div className={`mt-0.5 flex h-4 w-4 items-center justify-center rounded-full ${checkboxClass}`}>
+                    {checked ? <Icon className='w-2 stroke-[4]' name='check' size='custom' /> : null}
+                </div>
+                <div className='flex flex-col'>
+                    <span>{type.title}</span>
+                    <span className='text-sm'>{type.description}</span>
+                </div>
+            </div>
+        </button>
+    );
+};
+
+const Sidebar: React.FC = () => {
+    const typeOptions = [
+        {title: 'Discount', description: 'Offer a special reduced price'},
+        {title: 'Free trial', description: 'Give free access for a limited time'}
+    ];
+
+    const tierCadenceOptions = [
+        {value: '1', label: 'Bronze — Monthly'},
+        {value: '2', label: 'Bronze — Yearly'},
+        {value: '3', label: 'Silver — Monthly'},
+        {value: '4', label: 'Silver — Yearly'},
+        {value: '5', label: 'Gold — Monthly'},
+        {value: '6', label: 'Gold — Yearly'}
+    ];
+
+    const amountOptions = [
+        {value: '1', label: '%'},
+        {value: '2', label: 'USD'}
+    ];
+
+    const durationOptions = [
+        {value: '1', label: 'First-payment'},
+        {value: '2', label: 'Multiple-months'},
+        {value: '3', label: 'Forever'}
+    ];
+
+    return (
+        <div className='pt-7'>
+            <Form>
+                <TextField
+                    hint='Visible to members on Stripe Checkout page.'
+                    placeholder='Black Friday'
+                    title='Name'
+                />
+                <section className='mt-4'>
+                    <h2 className='mb-4 text-lg'>Offer details</h2>
+                    <div className='flex flex-col gap-6'>
+                        <div className='flex flex-col gap-4 rounded-md border border-grey-200 p-4'>
+                            <ButtonSelect checked={true} type={typeOptions[0]} />
+                            <ButtonSelect checked={false} type={typeOptions[1]} />
+                        </div>
+                        <Select
+                            options={tierCadenceOptions}
+                            selectedOption={tierCadenceOptions[0]}
+                            title='Tier — Cadence'
+                            onSelect={() => {}}
+                        />
+                        <div className='relative'>
+                            <TextField title='Amount off' type='number' />
+                            <div className='absolute bottom-0 right-1.5 z-10 w-10'>
+                                <Select
+                                    clearBg={true}
+                                    controlClasses={{menu: 'w-20 right-0'}}
+                                    options={amountOptions}
+                                    selectedOption={amountOptions[0]}
+                                    onSelect={() => {}}
+                                />
+                            </div>
+                        </div>
+                        <Select
+                            options={durationOptions}
+                            selectedOption={durationOptions[0]}
+                            title='Duration'
+                            onSelect={() => {}}
+                        />
+                    </div>
+                </section>
+                <section className='mt-4'>
+                    <h2 className='mb-4 text-lg'>Portal Settings</h2>
+                    <div className='flex flex-col gap-6'>
+                        <TextField
+                            placeholder='Black Friday Special'
+                            title='Display title'
+                        />
+                        <TextField
+                            placeholder='black-friday'
+                            title='Offer code'
+                        />
+                        <TextArea
+                            placeholder='Take advantage of this limited-time offer.'
+                            title='Display description'
+                        />
+                    </div>
+                </section>
+            </Form>
+        </div>
+    );
+};
+
+const AddOfferModal = () => {
+    const modal = useModal();
+    const {updateRoute} = useRouting();
+    const hasOffers = useFeatureFlag('adminXOffers');
+    // const {data: {tiers, meta, isEnd} = {}} = useBrowseTiers();
+    // const activeTiers = getActiveTiers(tiers || []);
+
+    useEffect(() => {
+        if (!hasOffers) {
+            modal.remove();
+            updateRoute('');
+        }
+    }, [hasOffers, modal, updateRoute]);
+
+    const cancelAddOffer = () => {
+        modal.remove();
+        updateRoute('offers/edit');
+    };
+
+    const sidebar = <Sidebar />;
+    // TODO: wire up the data from the sidebar inputs
+    let overrides : offerPortalPreviewUrlTypes = {
+        disableBackground: true,
+        name: 'Black Friday',
+        code: 'black-friday',
+        displayTitle: 'Black Friday Special',
+        displayDescription: 'Take advantage of this limited-time offer.',
+        type: 'discount',
+        cadence: 'monthly',
+        amount: 1200,
+        duration: '',
+        durationInMonths: 12,
+        currency: 'USD',
+        status: 'active',
+        tierId: ''
+    };
+
+    const href = getOfferPortalPreviewUrl(overrides, 'http://localhost:2368');
+
+    const iframe = <PortalFrame
+        href={href}
+
+    />;
+
+    return <PreviewModalContent cancelLabel='Cancel' deviceSelector={false} okLabel='Publish' preview={iframe} sidebar={sidebar} size='full' title='Offer' onCancel={cancelAddOffer} />;
+};
+
+export default NiceModal.create(AddOfferModal);
diff --git a/apps/admin-x-settings/src/components/settings/membership/offers/EditOfferModal.tsx b/apps/admin-x-settings/src/components/settings/membership/offers/EditOfferModal.tsx
new file mode 100644
index 00000000000..edf24dd10c4
--- /dev/null
+++ b/apps/admin-x-settings/src/components/settings/membership/offers/EditOfferModal.tsx
@@ -0,0 +1,165 @@
+import NiceModal, {useModal} from '@ebay/nice-modal-react';
+import useFeatureFlag from '../../../../hooks/useFeatureFlag';
+import useForm, {ErrorMessages} from '../../../../hooks/useForm';
+import useHandleError from '../../../../utils/api/handleError';
+import useRouting from '../../../../hooks/useRouting';
+import {Button, Form, PreviewModalContent, TextArea, TextField, showToast} from '@tryghost/admin-x-design-system';
+import {Offer, useBrowseOffersById, useEditOffer} from '../../../../api/offers';
+import {RoutingModalProps} from '../../../providers/RoutingProvider';
+import {getHomepageUrl} from '../../../../api/site';
+import {useEffect, useState} from 'react';
+import {useGlobalData} from '../../../providers/GlobalDataProvider';
+
+const Sidebar: React.FC<{
+        clearError: (field: string) => void,
+        errors: ErrorMessages,
+        offer: Offer, 
+        updateOffer: (fields: Partial<Offer>) => void, 
+        validate: () => void}> = ({clearError, errors, offer, updateOffer, validate}) => {
+            const {siteData} = useGlobalData();      
+            const [isCopied, setIsCopied] = useState(false);
+            
+            const offerUrl = `${getHomepageUrl(siteData!)}${offer?.code}`;
+            const handleCopyClick = async () => {
+                try {
+                    await navigator.clipboard.writeText(offerUrl);
+                    setIsCopied(true);
+                    setTimeout(() => setIsCopied(false), 1000); // reset after 1 seconds
+                } catch (err) {
+                    // eslint-disable-next-line no-console
+                    console.error('Failed to copy text: ', err);
+                }
+            };
+
+            return (
+                <div className='pt-7'>
+                    <Form>
+                        <TextField
+                            error={Boolean(errors.name)}
+                            hint={errors.name || 'Visible to members on Stripe Checkout page'}
+                            placeholder='Black Friday'
+                            title='Name'
+                            value={offer?.name}
+                            onBlur={validate}
+                            onChange={e => updateOffer({name: e.target.value})}
+                            onKeyDown={() => clearError('name')}
+                        />
+                        <section className='mt-4'>
+                            <h2 className='mb-4 text-lg'>Portal Settings</h2>
+                            <div className='flex flex-col gap-6'>
+                                <TextField
+                                    placeholder='Black Friday Special'
+                                    title='Display title'
+                                    value={offer?.display_title}
+                                    onChange={e => updateOffer({display_title: e.target.value})}
+                                />
+                                <TextField
+                                    error={Boolean(errors.code)}
+                                    hint={errors.code}
+                                    placeholder='black-friday'
+                                    title='Offer code'
+                                    value={offer?.code}
+                                    onBlur={validate}
+                                    onChange={e => updateOffer({code: e.target.value})}
+                                    onKeyDown={() => clearError('name')}
+                                />
+                                <TextArea
+                                    placeholder='Take advantage of this limited-time offer.'
+                                    title='Display description'
+                                    value={offer?.display_description}
+                                    onChange={e => updateOffer({display_description: e.target.value})}
+                                />
+                                <div className='flex flex-col gap-1.5'>
+                                    <TextField
+                                        disabled={Boolean(true)}
+                                        placeholder='https://www.example.com'
+                                        title='URL'
+                                        type='url'
+                                        value={offerUrl}
+                                    />
+                                    <Button color={isCopied ? 'green' : 'black'} label={isCopied ? 'Copied!' : 'Copy code'} onClick={handleCopyClick} />
+                                </div>
+                            </div>
+                        </section>
+                    </Form>
+                </div>
+            );
+        };
+
+const EditOfferModal: React.FC<RoutingModalProps> = ({params}) => {
+    const modal = useModal();
+    const {updateRoute} = useRouting();
+    const handleError = useHandleError();
+    const hasOffers = useFeatureFlag('adminXOffers');
+    const {mutateAsync: editOffer} = useEditOffer();
+
+    useEffect(() => {
+        if (!hasOffers) {
+            modal.remove();
+            updateRoute('');
+        }
+    }, [hasOffers, modal, updateRoute]);
+
+    const {data: {offers: offerById = []} = {}} = useBrowseOffersById(params?.id ? params?.id : '');
+
+    const {formState, saveState, updateForm, setFormState, handleSave, validate, errors, clearError, okProps} = useForm({
+        initialState: offerById[0],
+        savingDelay: 500,
+        onSave: async () => {
+            await editOffer(formState);
+        },
+        onSaveError: handleError,
+        onValidate: () => {
+            const newErrors: Record<string, string> = {};
+
+            if (!formState?.name) {
+                newErrors.name = 'Please enter a name';
+            }
+
+            if (!formState?.code) {
+                newErrors.code = 'Please enter a code';
+            }
+
+            return newErrors;
+        }
+    });
+
+    useEffect(() => {
+        setFormState(() => offerById[0]);
+    }, [setFormState, offerById[0]]);
+
+    const updateOffer = (fields: Partial<Offer>) => {
+        updateForm(state => ({...state, ...fields}));
+    };
+
+    const sidebar = <Sidebar
+        clearError={clearError}
+        errors={errors}
+        offer={formState}
+        updateOffer={updateOffer}
+        validate={validate}
+    />;
+
+    return offerById ? <PreviewModalContent deviceSelector={false}
+        dirty={saveState === 'unsaved'}
+        okColor={okProps.color}
+        okLabel={okProps.label || 'Save'}
+        sidebar={sidebar}
+        size='full'
+        testId='offer-update-modal'
+        title='Offer'
+        onCancel={() => {
+            modal.remove();
+            updateRoute('offers/edit');
+        }}
+        onOk={async () => {
+            if (!(await handleSave({fakeWhenUnchanged: true}))) {
+                showToast({
+                    type: 'pageError',
+                    message: 'Can\'t save offer, please double check that you\'ve filled all mandatory fields.'
+                });
+            }
+        }} /> : null;
+};
+
+export default NiceModal.create(EditOfferModal);
diff --git a/apps/admin-x-settings/src/components/settings/membership/offers/OffersModal.tsx b/apps/admin-x-settings/src/components/settings/membership/offers/OffersModal.tsx
new file mode 100644
index 00000000000..b142a46e43e
--- /dev/null
+++ b/apps/admin-x-settings/src/components/settings/membership/offers/OffersModal.tsx
@@ -0,0 +1,159 @@
+import NiceModal, {useModal} from '@ebay/nice-modal-react';
+import useFeatureFlag from '../../../../hooks/useFeatureFlag';
+import useRouting from '../../../../hooks/useRouting';
+import {Button, Modal, Tab, TabView} from '@tryghost/admin-x-design-system';
+import {Tier, getPaidActiveTiers, useBrowseTiers} from '../../../../api/tiers';
+import {currencyToDecimal, getSymbol} from '../../../../utils/currency';
+import {numberWithCommas} from '../../../../utils/helpers';
+import {useBrowseOffers} from '../../../../api/offers';
+import {useEffect, useState} from 'react';
+
+export type OfferType = 'percent' | 'fixed' | 'trial';
+
+const createRedemptionFilterUrl = (id: string): string => {
+    const baseHref = '/ghost/#/members';
+    return `${baseHref}?filter=${encodeURIComponent('offer_redemptions:' + id)}`;
+};
+
+const OfferCard: React.FC<{amount: number, cadence: string, currency: string, duration: string, name: string, offerId: string, offerTier: Tier | undefined, redemptionCount: number, type: OfferType, onClick: ()=>void}> = ({amount, cadence, currency, duration, name, offerId, offerTier, redemptionCount, type, onClick}) => {
+    let discountColor = '';
+    let discountOffer = '';
+    const originalPrice = cadence === 'month' ? offerTier?.monthly_price ?? 0 : offerTier?.yearly_price ?? 0;
+    let updatedPrice = originalPrice;
+    let tierName = offerTier?.name + ' ' + (cadence === 'month' ? 'Monthly' : 'Yearly') + ' — ' + (duration === 'once' ? 'First payment' : duration === 'repeating' ? 'Repeating' : 'Forever');
+    let originalPriceWithCurrency = getSymbol(currency) + numberWithCommas(currencyToDecimal(originalPrice));
+
+    switch (type) {
+    case 'percent':
+        discountColor = 'text-green';
+        discountOffer = amount + '% off';
+        updatedPrice = originalPrice - ((originalPrice * amount) / 100);
+        break;
+    case 'fixed':
+        discountColor = 'text-blue';
+        discountOffer = numberWithCommas(currencyToDecimal(amount)) + ' ' + currency + ' off';
+        updatedPrice = originalPrice - amount;
+        break;
+    case 'trial':
+        discountColor = 'text-pink';
+        discountOffer = amount + ' days free';
+        originalPriceWithCurrency = '';
+        break;
+    default:
+        break;
+    }
+
+    const updatedPriceWithCurrency = getSymbol(currency) + numberWithCommas(currencyToDecimal(updatedPrice));
+
+    return (
+        <div className='flex cursor-pointer flex-col gap-6 border border-transparent bg-grey-100 p-5 transition-all hover:border-grey-100 hover:bg-grey-75 hover:shadow-sm dark:bg-grey-950 dark:hover:border-grey-800' onClick={onClick}>
+            <div className='flex items-center justify-between'>
+                <h2 className='text-[1.6rem] font-semibold' onClick={onClick}>{name}</h2>
+                <span className={`text-xs font-semibold uppercase ${discountColor}`}>{discountOffer}</span>
+            </div>
+            <div className='flex items-baseline gap-1'>
+                <span className='text-4xl font-bold tracking-tight'>{updatedPriceWithCurrency}</span>
+                <span className='text-[1.6rem] font-medium text-grey-700 line-through'>{originalPriceWithCurrency}</span>
+            </div>
+            <div className='flex flex-col items-start text-xs'>
+                <span className='font-medium'>{tierName}</span>
+                <a className='text-grey-700 hover:underline' href={createRedemptionFilterUrl(offerId)}>{redemptionCount} redemptions</a>
+            </div>
+        </div>
+    );
+};
+
+const OffersModal = () => {
+    const modal = useModal();
+    const {updateRoute} = useRouting();
+    const hasOffers = useFeatureFlag('adminXOffers');
+    const {data: {offers: allOffers = []} = {}} = useBrowseOffers({
+        searchParams: {
+            limit: 'all'
+        }
+    });
+    const {data: {tiers: allTiers} = {}} = useBrowseTiers();
+    const paidActiveTiers = getPaidActiveTiers(allTiers || []);
+
+    useEffect(() => {
+        if (!hasOffers) {
+            modal.remove();
+            updateRoute('');
+        }
+    }, [hasOffers, modal, updateRoute]);
+
+    let offersTabs: Tab[] = [
+        {id: 'active', title: 'Active'},
+        {id: 'archived', title: 'Archived'}
+    ];
+    const [selectedTab, setSelectedTab] = useState('active');
+
+    const handleOfferEdit = (id:string) => {
+        // TODO: implement
+        modal.remove();
+        updateRoute(`offers/${id}`);
+    };
+
+    return <Modal
+        afterClose={() => {
+            updateRoute('offers');
+        }}
+        cancelLabel=''
+        footer={
+            <div className='mx-8 flex w-full items-center justify-between'>
+                <a className='text-sm' href="https://ghost.org/help/offers" rel="noopener noreferrer" target="_blank">→ Learn about offers in Ghost</a>
+                <Button color='black' label='Close' onClick={() => {
+                    modal.remove();
+                    updateRoute('offers');
+                }} />
+            </div>
+        }
+        header={false}
+        size='lg'
+        testId='offers-modal'
+        stickyFooter
+    >
+        <div className='pt-6'>
+            <header>
+                <div className='flex items-center justify-between'>
+                    <TabView
+                        border={false}
+                        selectedTab={selectedTab}
+                        tabs={offersTabs}
+                        width='wide'
+                        onTabChange={setSelectedTab}
+                    />
+                    <Button color='green' icon='add' iconColorClass='green' label='New offer' link={true} size='sm' onClick={() => updateRoute('offers/new')} />
+                </div>
+                <h1 className='mt-12 border-b border-b-grey-300 pb-2.5 text-3xl'>{offersTabs.find(tab => tab.id === selectedTab)?.title} offers</h1>
+            </header>
+            <div className='mt-8 grid grid-cols-3 gap-6'>
+                {allOffers.filter(offer => offer.status === selectedTab).map((offer) => {
+                    const offerTier = paidActiveTiers.find(tier => tier.id === offer?.tier.id);
+
+                    if (!offerTier) {
+                        return null;
+                    }
+
+                    return (
+                        <OfferCard
+                            key={offer?.id}
+                            amount={offer?.amount}
+                            cadence={offer?.cadence}
+                            currency={offer?.currency || 'USD'}
+                            duration={offer?.duration}
+                            name={offer?.name}
+                            offerId={offer?.id}
+                            offerTier={offerTier}
+                            redemptionCount={offer?.redemption_count}
+                            type={offer?.type as OfferType}
+                            onClick={() => handleOfferEdit(offer?.id)}
+                        />
+                    );
+                })}
+            </div>
+        </div>
+    </Modal>;
+};
+
+export default NiceModal.create(OffersModal);
diff --git a/apps/admin-x-settings/src/components/settings/membership/portal/AccountPage.tsx b/apps/admin-x-settings/src/components/settings/membership/portal/AccountPage.tsx
index b230c9afe5c..8a0f5b8ff6c 100644
--- a/apps/admin-x-settings/src/components/settings/membership/portal/AccountPage.tsx
+++ b/apps/admin-x-settings/src/components/settings/membership/portal/AccountPage.tsx
@@ -1,6 +1,5 @@
-import Form from '../../../../admin-x-ds/global/form/Form';
 import React, {FocusEventHandler, useEffect, useState} from 'react';
-import TextField from '../../../../admin-x-ds/global/form/TextField';
+import {Form, TextField} from '@tryghost/admin-x-design-system';
 import {SettingValue, getSettingValues} from '../../../../api/settings';
 import {fullEmailAddress, getEmailDomain} from '../../../../api/site';
 import {useGlobalData} from '../../../providers/GlobalDataProvider';
diff --git a/apps/admin-x-settings/src/components/settings/membership/portal/LookAndFeel.tsx b/apps/admin-x-settings/src/components/settings/membership/portal/LookAndFeel.tsx
index a1b4d74a729..bc66775ae19 100644
--- a/apps/admin-x-settings/src/components/settings/membership/portal/LookAndFeel.tsx
+++ b/apps/admin-x-settings/src/components/settings/membership/portal/LookAndFeel.tsx
@@ -1,13 +1,7 @@
-import Form from '../../../../admin-x-ds/global/form/Form';
-import Heading from '../../../../admin-x-ds/global/Heading';
-import Icon from '../../../../admin-x-ds/global/Icon';
-import ImageUpload from '../../../../admin-x-ds/global/form/ImageUpload';
 import React, {useState} from 'react';
-import Select from '../../../../admin-x-ds/global/form/Select';
-import TextField from '../../../../admin-x-ds/global/form/TextField';
-import Toggle from '../../../../admin-x-ds/global/form/Toggle';
 import clsx from 'clsx';
 import useHandleError from '../../../../utils/api/handleError';
+import {Form, Heading, Icon, ImageUpload, Select, TextField, Toggle} from '@tryghost/admin-x-design-system';
 import {ReactComponent as PortalIcon1} from '../../../../assets/icons/portal-icon-1.svg';
 import {ReactComponent as PortalIcon2} from '../../../../assets/icons/portal-icon-2.svg';
 import {ReactComponent as PortalIcon3} from '../../../../assets/icons/portal-icon-3.svg';
diff --git a/apps/admin-x-settings/src/components/settings/membership/portal/PortalFrame.tsx b/apps/admin-x-settings/src/components/settings/membership/portal/PortalFrame.tsx
index 9a0ac1803ce..47cbf6185e8 100644
--- a/apps/admin-x-settings/src/components/settings/membership/portal/PortalFrame.tsx
+++ b/apps/admin-x-settings/src/components/settings/membership/portal/PortalFrame.tsx
@@ -1,88 +1,19 @@
 import React, {useEffect, useRef, useState} from 'react';
-import {Config} from '../../../../api/config';
-import {Setting, checkStripeEnabled, getSettingValue} from '../../../../api/settings';
-import {SiteData} from '../../../../api/site';
-import {Tier} from '../../../../api/tiers';
-import {useGlobalData} from '../../../providers/GlobalDataProvider';
 
 type PortalFrameProps = {
-    settings: Setting[];
-    tiers: Tier[];
-    selectedTab: string;
+    selectedTab?: string;
+    href: string;
 }
 
-function getPortalPreviewUrl({settings, config, tiers, siteData, selectedTab}: {
-    settings: Setting[];
-    config: Config;
-    tiers: Tier[];
-    siteData: SiteData | null;
-    selectedTab: string;
-}) {
-    if (!siteData?.url) {
-        return null;
-    }
-    let portalTiers = tiers.filter((t) => {
-        return t.visibility === 'public' && t.type === 'paid';
-    }).map(t => t.id);
-
-    const baseUrl = siteData.url.replace(/\/$/, '');
-    const portalBase = '/?v=modal-portal-settings#/portal/preview';
-
-    const portalPlans: string[] = JSON.parse(getSettingValue<string>(settings, 'portal_plans') || '');
-    const membersSignupAccess = getSettingValue<string>(settings, 'members_signup_access');
-    const allowSelfSignup = membersSignupAccess === 'all' && (!checkStripeEnabled(settings, config) || portalPlans.includes('free'));
-
-    const settingsParam = new URLSearchParams();
-    settingsParam.append('button', getSettingValue(settings, 'portal_button') ? 'true' : 'false');
-    settingsParam.append('name', getSettingValue(settings, 'portal_name') ? 'true' : 'false');
-    settingsParam.append('isFree', portalPlans.includes('free') ? 'true' : 'false');
-    settingsParam.append('isMonthly', checkStripeEnabled(settings, config) && portalPlans.includes('monthly') ? 'true' : 'false');
-    settingsParam.append('isYearly', checkStripeEnabled(settings, config) && portalPlans.includes('yearly') ? 'true' : 'false');
-    settingsParam.append('page', selectedTab === 'account' ? 'accountHome' : 'signup');
-    settingsParam.append('buttonIcon', encodeURIComponent(getSettingValue(settings, 'portal_button_icon') || 'icon-1'));
-    settingsParam.append('signupButtonText', encodeURIComponent(getSettingValue(settings, 'portal_button_signup_text') || ''));
-    settingsParam.append('membersSignupAccess', getSettingValue(settings, 'members_signup_access') || 'all');
-    settingsParam.append('allowSelfSignup', allowSelfSignup ? 'true' : 'false');
-    settingsParam.append('signupTermsHtml', getSettingValue(settings, 'portal_signup_terms_html') || '');
-    settingsParam.append('signupCheckboxRequired', getSettingValue(settings, 'portal_signup_checkbox_required') ? 'true' : 'false');
-    settingsParam.append('portalProducts', encodeURIComponent(portalTiers.join(','))); // assuming that it might be more than 1
-
-    if (portalPlans && portalPlans.length) {
-        settingsParam.append('portalPrices', encodeURIComponent(portalPlans.join(',')));
-    }
-
-    const accentColor = getSettingValue(settings, 'accent_color');
-    if (accentColor !== undefined && accentColor !== null) {
-        settingsParam.append('accentColor', encodeURIComponent(accentColor));
+// we should refactor this to be reused in offers as well
+const PortalFrame: React.FC<PortalFrameProps> = ({selectedTab, href}) => {
+    if (!selectedTab) {
+        selectedTab = 'signup';
     }
 
-    const portalButtonStyle = getSettingValue(settings, 'portal_button_style');
-    if (portalButtonStyle) {
-        settingsParam.append('buttonStyle', encodeURIComponent(portalButtonStyle));
-    }
-
-    settingsParam.append('disableBackground', 'false');
-
-    return `${baseUrl}${portalBase}?${settingsParam.toString()}`;
-}
-
-const PortalFrame: React.FC<PortalFrameProps> = ({settings, tiers, selectedTab}) => {
-    const {
-        siteData,
-        config
-    } = useGlobalData();
-
     const iframeRef = useRef<HTMLIFrameElement>(null);
     const [portalReady, setPortalReady] = useState(false);
 
-    let href = getPortalPreviewUrl({
-        settings,
-        config,
-        tiers,
-        siteData,
-        selectedTab
-    });
-
     useEffect(() => {
         const messageListener = (event: MessageEvent<'portal-ready' | {type: string}>) => {
             if (!href) {
diff --git a/apps/admin-x-settings/src/components/settings/membership/portal/PortalLinks.tsx b/apps/admin-x-settings/src/components/settings/membership/portal/PortalLinks.tsx
index d32b62a60fb..138c968c0c2 100644
--- a/apps/admin-x-settings/src/components/settings/membership/portal/PortalLinks.tsx
+++ b/apps/admin-x-settings/src/components/settings/membership/portal/PortalLinks.tsx
@@ -1,10 +1,5 @@
-import Button from '../../../../admin-x-ds/global/Button';
-import List from '../../../../admin-x-ds/global/List';
-import ListItem from '../../../../admin-x-ds/global/ListItem';
-import ModalPage from '../../../../admin-x-ds/global/modal/ModalPage';
 import React, {useEffect, useId, useState} from 'react';
-import Select from '../../../../admin-x-ds/global/form/Select';
-import TextField from '../../../../admin-x-ds/global/form/TextField';
+import {Button, List, ListItem, ModalPage, Select, TextField} from '@tryghost/admin-x-design-system';
 import {getHomepageUrl} from '../../../../api/site';
 import {getPaidActiveTiers, useBrowseTiers} from '../../../../api/tiers';
 import {useGlobalData} from '../../../providers/GlobalDataProvider';
@@ -27,12 +22,11 @@ const PortalLink: React.FC<PortalLinkPrefs> = ({name, value}) => {
                     button.innerText = 'Copy';
                 }, 1000);
             }}/>}
-            hideActions
             separator
         >
-            <div className='flex w-full grow items-center gap-5 py-3'>
-                <label className='inline-block w-[240px] whitespace-nowrap' htmlFor={id}>{name}</label>
-                <TextField className='border-b-500 grow bg-transparent p-1 text-grey-700' id={id} value={value} disabled unstyled />
+            <div className='flex w-full grow flex-col py-3 lg:flex-row lg:items-center lg:gap-2'>
+                <label className='inline-block whitespace-nowrap lg:w-[180px] lg:min-w-[180px]' htmlFor={id}>{name}:</label>
+                <TextField className='border-b-500 grow bg-transparent py-1 text-grey-700 lg:p-1' id={id} value={value} disabled unstyled />
             </div>
         </ListItem>
     );
@@ -79,8 +73,8 @@ const PortalLinks: React.FC = () => {
                     hideActions
                     separator
                 >
-                    <div className='flex w-full items-center gap-5 py-2 pr-6'>
-                        <span className='inline-block w-[240px] shrink-0'>Tier</span>
+                    <div className='flex w-full items-center gap-2 py-2'>
+                        <span className='inline-block w-[180px] min-w-[180px] shrink-0'>Tier:</span>
                         <Select
                             options={tierOptions}
                             selectedOption={tierOptions.find(option => option.value === selectedTier)}
diff --git a/apps/admin-x-settings/src/components/settings/membership/portal/PortalModal.tsx b/apps/admin-x-settings/src/components/settings/membership/portal/PortalModal.tsx
index ce0718b20e1..b8d845c5883 100644
--- a/apps/admin-x-settings/src/components/settings/membership/portal/PortalModal.tsx
+++ b/apps/admin-x-settings/src/components/settings/membership/portal/PortalModal.tsx
@@ -1,16 +1,14 @@
 import AccountPage from './AccountPage';
-import ConfirmationModal from '../../../../admin-x-ds/global/modal/ConfirmationModal';
 import LookAndFeel from './LookAndFeel';
 import NiceModal from '@ebay/nice-modal-react';
 import PortalPreview from './PortalPreview';
 import React, {useEffect, useState} from 'react';
 import SignupOptions from './SignupOptions';
-import TabView, {Tab} from '../../../../admin-x-ds/global/TabView';
 import useForm, {Dirtyable} from '../../../../hooks/useForm';
 import useHandleError from '../../../../utils/api/handleError';
 import useQueryParams from '../../../../hooks/useQueryParams';
 import useRouting from '../../../../hooks/useRouting';
-import {PreviewModalContent} from '../../../../admin-x-ds/global/modal/PreviewModal';
+import {ConfirmationModal, PreviewModalContent, Tab, TabView} from '@tryghost/admin-x-design-system';
 import {Setting, SettingValue, getSettingValues, useEditSettings} from '../../../../api/settings';
 import {Tier, useBrowseTiers, useEditTier} from '../../../../api/tiers';
 import {fullEmailAddress} from '../../../../api/site';
@@ -115,12 +113,14 @@ const PortalModal: React.FC = () => {
         }
     }, [handleError, verifyEmail, verifyToken]);
 
-    const {formState, setFormState, saveState, handleSave, updateForm} = useForm({
+    const {formState, setFormState, saveState, handleSave, updateForm, okProps} = useForm({
         initialState: {
             settings: settings as Dirtyable<Setting>[],
             tiers: allTiers as Dirtyable<Tier>[] || []
         },
 
+        savingDelay: 500,
+
         onSave: async () => {
             await Promise.all(formState.tiers.filter(({dirty}) => dirty).map(tier => editTier(tier)));
             setFormState(state => ({...state, tiers: formState.tiers.map(tier => ({...tier, dirty: false}))}));
@@ -204,22 +204,17 @@ const PortalModal: React.FC = () => {
         {id: 'account', title: 'Account page'},
         {id: 'links', title: 'Links'}
     ];
-    let okLabel = 'Save';
-    if (saveState === 'saving') {
-        okLabel = 'Saving...';
-    } else if (saveState === 'saved') {
-        okLabel = 'Saved';
-    }
 
     return <PreviewModalContent
         afterClose={() => {
             updateRoute('portal');
         }}
+        buttonsDisabled={okProps.disabled}
         cancelLabel='Close'
         deviceSelector={false}
         dirty={saveState === 'unsaved'}
-        okColor={saveState === 'saved' ? 'green' : 'black'}
-        okLabel={okLabel}
+        okColor={okProps.color}
+        okLabel={okProps.label || 'Save'}
         preview={preview}
         previewBgColor={selectedPreviewTab === 'links' ? 'white' : 'greygradient'}
         previewToolbarTabs={previewTabs}
diff --git a/apps/admin-x-settings/src/components/settings/membership/portal/PortalPreview.tsx b/apps/admin-x-settings/src/components/settings/membership/portal/PortalPreview.tsx
index f886cbab9a4..f9741867020 100644
--- a/apps/admin-x-settings/src/components/settings/membership/portal/PortalPreview.tsx
+++ b/apps/admin-x-settings/src/components/settings/membership/portal/PortalPreview.tsx
@@ -3,6 +3,8 @@ import PortalLinks from './PortalLinks';
 import React from 'react';
 import {Setting} from '../../../../api/settings';
 import {Tier} from '../../../../api/tiers';
+import {getPortalPreviewUrl} from '../../../../utils/getPortalPreviewUrl';
+import {useGlobalData} from '../../../providers/GlobalDataProvider';
 
 interface PortalPreviewProps {
     selectedTab: string;
@@ -15,13 +17,26 @@ const PortalPreview: React.FC<PortalPreviewProps> = ({
     localSettings,
     localTiers
 }) => {
+    const {
+        siteData,
+        config
+    } = useGlobalData();
+
+    const href = getPortalPreviewUrl({
+        settings: localSettings,
+        tiers: localTiers,
+        selectedTab,
+        siteData,
+        config
+    });
+
     let tabContents = <></>;
 
     switch (selectedTab) {
     case 'account':
         tabContents = (
             <>
-                <PortalFrame selectedTab={selectedTab} settings={localSettings} tiers={localTiers} />
+                <PortalFrame href={href || ''} selectedTab={selectedTab} />
             </>
         );
         break;
@@ -31,7 +46,7 @@ const PortalPreview: React.FC<PortalPreviewProps> = ({
     default:
         tabContents = (
             <>
-                <PortalFrame selectedTab={selectedTab} settings={localSettings} tiers={localTiers} />
+                <PortalFrame href={href || ''} selectedTab={selectedTab} />
             </>
         );
         break;
diff --git a/apps/admin-x-settings/src/components/settings/membership/portal/SignupOptions.tsx b/apps/admin-x-settings/src/components/settings/membership/portal/SignupOptions.tsx
index e13bd619395..72016ea3007 100644
--- a/apps/admin-x-settings/src/components/settings/membership/portal/SignupOptions.tsx
+++ b/apps/admin-x-settings/src/components/settings/membership/portal/SignupOptions.tsx
@@ -1,9 +1,5 @@
-import CheckboxGroup from '../../../../admin-x-ds/global/form/CheckboxGroup';
-import Form from '../../../../admin-x-ds/global/form/Form';
-import HtmlField from '../../../../admin-x-ds/global/form/HtmlField';
 import React, {useCallback, useEffect, useMemo} from 'react';
-import Toggle from '../../../../admin-x-ds/global/form/Toggle';
-import {CheckboxProps} from '../../../../admin-x-ds/global/form/Checkbox';
+import {CheckboxGroup, CheckboxProps, Form, HtmlField, Toggle} from '@tryghost/admin-x-design-system';
 import {Setting, SettingValue, checkStripeEnabled, getSettingValues} from '../../../../api/settings';
 import {Tier, getPaidActiveTiers} from '../../../../api/tiers';
 import {useGlobalData} from '../../../providers/GlobalDataProvider';
diff --git a/apps/admin-x-settings/src/components/settings/membership/recommendations/AddRecommendationModal.tsx b/apps/admin-x-settings/src/components/settings/membership/recommendations/AddRecommendationModal.tsx
index 773a7e69958..034efdd31b3 100644
--- a/apps/admin-x-settings/src/components/settings/membership/recommendations/AddRecommendationModal.tsx
+++ b/apps/admin-x-settings/src/components/settings/membership/recommendations/AddRecommendationModal.tsx
@@ -1,20 +1,13 @@
 import AddRecommendationModalConfirm from './AddRecommendationModalConfirm';
-import Form from '../../../../admin-x-ds/global/form/Form';
-import Modal from '../../../../admin-x-ds/global/modal/Modal';
 import NiceModal, {useModal} from '@ebay/nice-modal-react';
 import React, {useEffect, useState} from 'react';
-import TextField from '../../../../admin-x-ds/global/form/TextField';
 import useForm, {ErrorMessages} from '../../../../hooks/useForm';
 import useRouting from '../../../../hooks/useRouting';
 import {AlreadyExistsError} from '../../../../utils/errors';
-import {EditOrAddRecommendation, RecommendationResponseType, useGetRecommendationByUrl} from '../../../../api/recommendations';
-import {LoadingIndicator} from '../../../../admin-x-ds/global/LoadingIndicator';
+import {EditOrAddRecommendation, useCheckRecommendation} from '../../../../api/recommendations';
+import {Form, LoadingIndicator, Modal, TextField, dismissAllToasts, formatUrl, showToast} from '@tryghost/admin-x-design-system';
 import {RoutingModalProps} from '../../../providers/RoutingProvider';
-import {arePathsEqual, trimSearchAndHash} from '../../../../utils/url';
-import {dismissAllToasts, showToast} from '../../../../admin-x-ds/global/Toast';
-import {formatUrl} from '../../../../admin-x-ds/global/form/URLTextField';
-import {useExternalGhostSite} from '../../../../api/external-ghost-site';
-import {useGetOembed} from '../../../../api/oembed';
+import {trimSearchAndHash} from '../../../../utils/url';
 
 interface AddRecommendationModalProps {
     recommendation?: EditOrAddRecommendation,
@@ -45,9 +38,7 @@ const AddRecommendationModal: React.FC<RoutingModalProps & AddRecommendationModa
     const [enterPressed, setEnterPressed] = useState(false);
     const modal = useModal();
     const {updateRoute} = useRouting();
-    const {query: queryOembed} = useGetOembed();
-    const {query: queryExternalGhostSite} = useExternalGhostSite();
-    const {query: getRecommendationByUrl} = useGetRecommendationByUrl();
+    const {mutateAsync: checkRecommendation} = useCheckRecommendation();
 
     // Handle a URL that was passed via the URL
     const initialUrl = recommendation ? '' : (searchParams?.get('url') ?? '');
@@ -72,26 +63,6 @@ const AddRecommendationModal: React.FC<RoutingModalProps & AddRecommendationModa
             validatedUrl = new URL(formState.url);
             validatedUrl = trimSearchAndHash(validatedUrl);
 
-            // Check if the recommendation already exists
-            const {recommendations = []} = await getRecommendationByUrl(validatedUrl) as RecommendationResponseType;
-            if (recommendations && recommendations.length > 0) {
-                const existing = recommendations.find(r => arePathsEqual(r.url, validatedUrl.toString()));
-
-                if (existing) {
-                    throw new AlreadyExistsError('A recommendation with this URL already exists.');
-                }
-            }
-
-            // Check if it's a Ghost site or not:
-            // 1. Check the full path first. This is the most common use case, and also helps to cover Ghost sites that are hosted on a subdirectory
-            // 2. If needed, check the origin. This helps to cover cases where the recommendation URL is a subpage or a post URL of the Ghost site
-            let externalGhostSite = null;
-            externalGhostSite = await queryExternalGhostSite(validatedUrl.toString());
-
-            if (!externalGhostSite && validatedUrl.pathname !== '' && validatedUrl.pathname !== '/') {
-                externalGhostSite = await queryExternalGhostSite(validatedUrl.origin);
-            }
-
             // Use the hostname as fallback title
             const defaultTitle = validatedUrl.hostname.replace('www.', '');
 
@@ -100,25 +71,28 @@ const AddRecommendationModal: React.FC<RoutingModalProps & AddRecommendationModa
                 url: validatedUrl.toString()
             };
 
-            if (externalGhostSite) {
-                // For Ghost sites, we use the data from the API
-                updatedRecommendation.title = externalGhostSite.site.title || defaultTitle;
-                updatedRecommendation.excerpt = externalGhostSite.site.description ?? formState.excerpt ?? null;
-                updatedRecommendation.featured_image = externalGhostSite.site.cover_image?.toString() ?? formState.featured_image ?? null;
-                updatedRecommendation.favicon = externalGhostSite.site.icon?.toString() ?? externalGhostSite.site.logo?.toString() ?? formState.favicon ?? null;
-                updatedRecommendation.one_click_subscribe = externalGhostSite.site.allow_external_signup;
-            } else {
-                // For non-Ghost sites, we use the Oemebd API to fetch metadata
-                const oembed = await queryOembed({
-                    url: formState.url,
-                    type: 'mention'
-                });
-                updatedRecommendation.title = oembed?.metadata?.title ?? defaultTitle;
-                updatedRecommendation.excerpt = oembed?.metadata?.description ?? formState.excerpt ?? null;
-                updatedRecommendation.featured_image = oembed?.metadata?.thumbnail ?? formState.featured_image ?? null;
-                updatedRecommendation.favicon = oembed?.metadata?.icon ?? formState.favicon ?? null;
-                updatedRecommendation.one_click_subscribe = false;
+            // Check if the recommendation already exists, or fetch metadata if it's a new recommendation
+            const {recommendations = []} = await checkRecommendation(validatedUrl);
+
+            if (!recommendations || recommendations.length === 0) {
+                // Oops! Failed to fetch metadata
+                return;
+            }
+
+            const existing = recommendations[0];
+
+            if (existing.id) {
+                throw new AlreadyExistsError('A recommendation with this URL already exists.');
             }
+
+            // Update metadata so we can preview it
+            updatedRecommendation.title = existing.title ?? defaultTitle;
+            updatedRecommendation.excerpt = existing.excerpt ?? updatedRecommendation.excerpt;
+            updatedRecommendation.featured_image = existing.featured_image ?? updatedRecommendation.featured_image ?? null;
+            updatedRecommendation.favicon = existing.favicon ?? updatedRecommendation.favicon ?? null;
+            updatedRecommendation.one_click_subscribe = existing.one_click_subscribe ?? updatedRecommendation.one_click_subscribe ?? false;
+
+            // Set a default description (excerpt)
             updatedRecommendation.description = updatedRecommendation.excerpt || null;
 
             // Switch modal without changing the route (the second modal is not reachable by URL)
diff --git a/apps/admin-x-settings/src/components/settings/membership/recommendations/AddRecommendationModalConfirm.tsx b/apps/admin-x-settings/src/components/settings/membership/recommendations/AddRecommendationModalConfirm.tsx
index 42606d03f76..c68498e3444 100644
--- a/apps/admin-x-settings/src/components/settings/membership/recommendations/AddRecommendationModalConfirm.tsx
+++ b/apps/admin-x-settings/src/components/settings/membership/recommendations/AddRecommendationModalConfirm.tsx
@@ -1,5 +1,4 @@
 import AddRecommendationModal from './AddRecommendationModal';
-import Modal from '../../../../admin-x-ds/global/modal/Modal';
 import NiceModal, {useModal} from '@ebay/nice-modal-react';
 import React from 'react';
 import RecommendationDescriptionForm, {validateDescriptionForm} from './RecommendationDescriptionForm';
@@ -8,7 +7,7 @@ import useForm from '../../../../hooks/useForm';
 import useHandleError from '../../../../utils/api/handleError';
 import useRouting from '../../../../hooks/useRouting';
 import {EditOrAddRecommendation, useAddRecommendation} from '../../../../api/recommendations';
-import {dismissAllToasts, showToast} from '../../../../admin-x-ds/global/Toast';
+import {Modal, dismissAllToasts, showToast} from '@tryghost/admin-x-design-system';
 
 interface AddRecommendationModalProps {
     recommendation: EditOrAddRecommendation,
diff --git a/apps/admin-x-settings/src/components/settings/membership/recommendations/EditRecommendationModal.tsx b/apps/admin-x-settings/src/components/settings/membership/recommendations/EditRecommendationModal.tsx
index 4d5feb35973..df0f6cbf523 100644
--- a/apps/admin-x-settings/src/components/settings/membership/recommendations/EditRecommendationModal.tsx
+++ b/apps/admin-x-settings/src/components/settings/membership/recommendations/EditRecommendationModal.tsx
@@ -1,14 +1,12 @@
-import ConfirmationModal from '../../../../admin-x-ds/global/modal/ConfirmationModal';
-import Modal from '../../../../admin-x-ds/global/modal/Modal';
 import NiceModal, {useModal} from '@ebay/nice-modal-react';
 import React from 'react';
 import RecommendationDescriptionForm, {validateDescriptionForm} from './RecommendationDescriptionForm';
 import useForm from '../../../../hooks/useForm';
 import useHandleError from '../../../../utils/api/handleError';
 import useRouting from '../../../../hooks/useRouting';
+import {ConfirmationModal, Modal, dismissAllToasts, showToast} from '@tryghost/admin-x-design-system';
 import {Recommendation, useDeleteRecommendation, useEditRecommendation} from '../../../../api/recommendations';
 import {RoutingModalProps} from '../../../providers/RoutingProvider';
-import {dismissAllToasts, showToast} from '../../../../admin-x-ds/global/Toast';
 
 interface EditRecommendationModalProps {
     recommendation: Recommendation,
@@ -22,12 +20,16 @@ const EditRecommendationModal: React.FC<RoutingModalProps & EditRecommendationMo
     const {mutateAsync: deleteRecommendation} = useDeleteRecommendation();
     const handleError = useHandleError();
 
-    const {formState, updateForm, handleSave, saveState, errors, clearError, setErrors} = useForm({
+    const {formState, updateForm, handleSave, errors, clearError, setErrors, okProps} = useForm({
         initialState: {
             ...recommendation
         },
+        savingDelay: 500,
+        savedDelay: 500,
         onSave: async (state) => {
             await editRecommendation(state);
+        },
+        onSavedStateReset: () => {
             modal.remove();
             updateRoute('recommendations');
         },
@@ -46,14 +48,6 @@ const EditRecommendationModal: React.FC<RoutingModalProps & EditRecommendationMo
         }
     });
 
-    let okLabel = 'Save';
-
-    if (saveState === 'saving') {
-        okLabel = 'Saving...';
-    } else if (saveState === 'saved') {
-        okLabel = 'Saved';
-    }
-
     let leftButtonProps = {
         label: 'Delete',
         link: true,
@@ -94,20 +88,16 @@ const EditRecommendationModal: React.FC<RoutingModalProps & EditRecommendationMo
         }}
         animate={animate ?? true}
         backDropClick={false}
+        buttonsDisabled={okProps.disabled}
         cancelLabel={'Cancel'}
         leftButtonProps={leftButtonProps}
-        okColor='black'
-        okLabel={okLabel}
+        okColor={okProps.color}
+        okLabel={okProps.label || 'Save & close'}
         size='sm'
         testId='edit-recommendation-modal'
         title={'Edit recommendation'}
         stickyFooter
         onOk={async () => {
-            if (saveState === 'saving') {
-                // Already saving
-                return;
-            }
-
             dismissAllToasts();
             try {
                 await handleSave({force: true});
diff --git a/apps/admin-x-settings/src/components/settings/membership/recommendations/IncomingRecommendationList.tsx b/apps/admin-x-settings/src/components/settings/membership/recommendations/IncomingRecommendationList.tsx
index 946669e9e78..24bdbfa230b 100644
--- a/apps/admin-x-settings/src/components/settings/membership/recommendations/IncomingRecommendationList.tsx
+++ b/apps/admin-x-settings/src/components/settings/membership/recommendations/IncomingRecommendationList.tsx
@@ -1,13 +1,8 @@
-import Button from '../../../../admin-x-ds/global/Button';
-import NoValueLabel from '../../../../admin-x-ds/global/NoValueLabel';
 import React, {useMemo} from 'react';
 import RecommendationIcon from './RecommendationIcon';
-import Table, {ShowMoreData} from '../../../../admin-x-ds/global/Table';
-import TableCell from '../../../../admin-x-ds/global/TableCell';
-import TableRow from '../../../../admin-x-ds/global/TableRow';
 import useRouting from '../../../../hooks/useRouting';
+import {Button, NoValueLabel, PaginationData, ShowMoreData, Table, TableCell, TableRow} from '@tryghost/admin-x-design-system';
 import {IncomingRecommendation} from '../../../../api/recommendations';
-import {PaginationData} from '../../../../hooks/usePagination';
 import {ReferrerHistoryItem} from '../../../../api/referrers';
 import {numberWithCommas} from '../../../../utils/helpers';
 
diff --git a/apps/admin-x-settings/src/components/settings/membership/recommendations/RecommendationDescriptionForm.tsx b/apps/admin-x-settings/src/components/settings/membership/recommendations/RecommendationDescriptionForm.tsx
index b7b44b68adf..880b31a33cb 100644
--- a/apps/admin-x-settings/src/components/settings/membership/recommendations/RecommendationDescriptionForm.tsx
+++ b/apps/admin-x-settings/src/components/settings/membership/recommendations/RecommendationDescriptionForm.tsx
@@ -1,13 +1,8 @@
-import Form from '../../../../admin-x-ds/global/form/Form';
-import Heading from '../../../../admin-x-ds/global/Heading';
-import Hint from '../../../../admin-x-ds/global/Hint';
 import React from 'react';
 import RecommendationIcon from './RecommendationIcon';
-import TextArea from '../../../../admin-x-ds/global/form/TextArea';
-import TextField from '../../../../admin-x-ds/global/form/TextField';
-import URLTextField from '../../../../admin-x-ds/global/form/URLTextField';
 import {EditOrAddRecommendation, Recommendation} from '../../../../api/recommendations';
 import {ErrorMessages} from '../../../../hooks/useForm';
+import {Form, Heading, Hint, TextArea, TextField, URLTextField} from '@tryghost/admin-x-design-system';
 
 interface Props<T extends EditOrAddRecommendation> {
     showURL?: boolean,
diff --git a/apps/admin-x-settings/src/components/settings/membership/recommendations/RecommendationList.tsx b/apps/admin-x-settings/src/components/settings/membership/recommendations/RecommendationList.tsx
index d0eb8b4a368..e9e78364aa1 100644
--- a/apps/admin-x-settings/src/components/settings/membership/recommendations/RecommendationList.tsx
+++ b/apps/admin-x-settings/src/components/settings/membership/recommendations/RecommendationList.tsx
@@ -1,17 +1,10 @@
-import Button from '../../../../admin-x-ds/global/Button';
 import EditRecommendationModal from './EditRecommendationModal';
-import Link from '../../../../admin-x-ds/global/Link';
 import NiceModal from '@ebay/nice-modal-react';
-import NoValueLabel from '../../../../admin-x-ds/global/NoValueLabel';
 import React, {useState} from 'react';
 import RecommendationIcon from './RecommendationIcon';
-import Table, {ShowMoreData} from '../../../../admin-x-ds/global/Table';
-import TableCell from '../../../../admin-x-ds/global/TableCell';
-import TableRow from '../../../../admin-x-ds/global/TableRow';
-import Tooltip from '../../../../admin-x-ds/global/Tooltip';
 import useRouting from '../../../../hooks/useRouting';
 import useSettingGroup from '../../../../hooks/useSettingGroup';
-import {PaginationData} from '../../../../hooks/usePagination';
+import {Button, Link, NoValueLabel, PaginationData, ShowMoreData, Table, TableCell, TableRow, Tooltip} from '@tryghost/admin-x-design-system';
 import {Recommendation} from '../../../../api/recommendations';
 import {numberWithCommas} from '../../../../utils/helpers';
 
diff --git a/apps/admin-x-settings/src/components/settings/membership/stripe/StripeConnectModal.tsx b/apps/admin-x-settings/src/components/settings/membership/stripe/StripeConnectModal.tsx
index 71d21ec688a..3d86ddf1845 100644
--- a/apps/admin-x-settings/src/components/settings/membership/stripe/StripeConnectModal.tsx
+++ b/apps/admin-x-settings/src/components/settings/membership/stripe/StripeConnectModal.tsx
@@ -1,26 +1,17 @@
 import BookmarkThumb from '../../../../assets/images/stripe-thumb.jpg';
-import Button from '../../../../admin-x-ds/global/Button';
-import ConfirmationModal from '../../../../admin-x-ds/global/modal/ConfirmationModal';
-import Form from '../../../../admin-x-ds/global/form/Form';
 import GhostLogo from '../../../../assets/images/orb-squircle.png';
 import GhostLogoPink from '../../../../assets/images/orb-pink.png';
-import Heading from '../../../../admin-x-ds/global/Heading';
-import Modal from '../../../../admin-x-ds/global/modal/Modal';
 import NiceModal, {useModal} from '@ebay/nice-modal-react';
 import React, {useState} from 'react';
-import StripeButton from '../../../../admin-x-ds/settings/StripeButton';
 import StripeLogo from '../../../../assets/images/stripe-emblem.svg';
-import TextArea from '../../../../admin-x-ds/global/form/TextArea';
-import TextField from '../../../../admin-x-ds/global/form/TextField';
-import Toggle from '../../../../admin-x-ds/global/form/Toggle';
 import useHandleError from '../../../../utils/api/handleError';
 import useRouting from '../../../../hooks/useRouting';
 import useSettingGroup from '../../../../hooks/useSettingGroup';
+import {Button, ConfirmationModal, Form, Heading, Modal, StripeButton, TextArea, TextField, Toggle, showToast} from '@tryghost/admin-x-design-system';
 import {JSONError} from '../../../../utils/errors';
 import {ReactComponent as StripeVerified} from '../../../../assets/images/stripe-verified.svg';
 import {checkStripeEnabled, getSettingValue, getSettingValues, useDeleteStripeSettings, useEditSettings} from '../../../../api/settings';
 import {getGhostPaths} from '../../../../utils/helpers';
-import {showToast} from '../../../../admin-x-ds/global/Toast';
 import {toast} from 'react-hot-toast';
 import {useBrowseMembers} from '../../../../api/members';
 import {useBrowseTiers, useEditTier} from '../../../../api/tiers';
@@ -293,9 +284,9 @@ const StripeConnectModal: React.FC = () => {
         }}
         cancelLabel=''
         footer={<div className='mt-8'></div>}
-        size={stripeConnectAccountId ? 740 : 520}
         testId='stripe-modal'
         title=''
+        width={stripeConnectAccountId ? 740 : 520}
         hideXOnMobile
     >
         {contents}
diff --git a/apps/admin-x-settings/src/components/settings/membership/tiers/TierDetailModal.tsx b/apps/admin-x-settings/src/components/settings/membership/tiers/TierDetailModal.tsx
index 30640a871b3..0ea4664120a 100644
--- a/apps/admin-x-settings/src/components/settings/membership/tiers/TierDetailModal.tsx
+++ b/apps/admin-x-settings/src/components/settings/membership/tiers/TierDetailModal.tsx
@@ -1,28 +1,16 @@
-import Button, {ButtonProps} from '../../../../admin-x-ds/global/Button';
-import ConfirmationModal from '../../../../admin-x-ds/global/modal/ConfirmationModal';
-import CurrencyField from '../../../../admin-x-ds/global/form/CurrencyField';
-import Form from '../../../../admin-x-ds/global/form/Form';
-import Heading from '../../../../admin-x-ds/global/Heading';
-import Icon from '../../../../admin-x-ds/global/Icon';
-import Modal from '../../../../admin-x-ds/global/modal/Modal';
 import NiceModal, {useModal} from '@ebay/nice-modal-react';
-import React, {useEffect, useRef, useState} from 'react';
-import Select from '../../../../admin-x-ds/global/form/Select';
-import SortableList from '../../../../admin-x-ds/global/SortableList';
-import TextField from '../../../../admin-x-ds/global/form/TextField';
+import React, {useEffect, useRef} from 'react';
 import TierDetailPreview from './TierDetailPreview';
-import Toggle from '../../../../admin-x-ds/global/form/Toggle';
-import URLTextField from '../../../../admin-x-ds/global/form/URLTextField';
-import useForm from '../../../../hooks/useForm';
+import useForm, {ErrorMessages} from '../../../../hooks/useForm';
 import useHandleError from '../../../../utils/api/handleError';
 import useRouting from '../../../../hooks/useRouting';
 import useSettingGroup from '../../../../hooks/useSettingGroup';
 import useSortableIndexedList from '../../../../hooks/useSortableIndexedList';
+import {Button, ButtonProps, ConfirmationModal, CurrencyField, Form, Heading, Icon, Modal, Select, SortableList, TextField, Toggle, URLTextField, showToast} from '@tryghost/admin-x-design-system';
 import {RoutingModalProps} from '../../../providers/RoutingProvider';
 import {Tier, useAddTier, useBrowseTiers, useEditTier} from '../../../../api/tiers';
 import {currencies, currencySelectGroups, validateCurrencyAmount} from '../../../../utils/currency';
 import {getSettingValues} from '../../../../api/settings';
-import {showToast} from '../../../../admin-x-ds/global/Toast';
 import {toast} from 'react-hot-toast';
 
 export type TierFormState = Partial<Omit<Tier, 'trial_days'>> & {
@@ -41,14 +29,13 @@ const TierDetailModalContent: React.FC<{tier?: Tier}> = ({tier}) => {
     const {localSettings, siteData} = useSettingGroup();
     const siteTitle = getSettingValues(localSettings, ['title']) as string[];
 
-    const [errors, setErrors] = useState<{ [key in keyof Tier]?: string }>({}); // eslint-disable-line no-unused-vars
-
-    const setError = (field: keyof Tier, error: string | undefined) => {
-        setErrors(errs => ({...errs, [field]: error}));
-        return error;
+    const validators: {[key in keyof Tier]?: () => string | undefined} = {
+        name: () => (formState.name ? undefined : 'You must specify a name'),
+        monthly_price: () => (formState.type !== 'free' ? validateCurrencyAmount(formState.monthly_price || 0, formState.currency, {allowZero: false}) : undefined),
+        yearly_price: () => (formState.type !== 'free' ? validateCurrencyAmount(formState.yearly_price || 0, formState.currency, {allowZero: false}) : undefined)
     };
 
-    const {formState, saveState, updateForm, handleSave} = useForm<TierFormState>({
+    const {formState, saveState, updateForm, handleSave, errors, setErrors, clearError, okProps} = useForm<TierFormState>({
         initialState: {
             ...(tier || {}),
             trial_days: tier?.trial_days?.toString() || '',
@@ -56,6 +43,17 @@ const TierDetailModalContent: React.FC<{tier?: Tier}> = ({tier}) => {
             visibility: tier?.visibility || 'none',
             welcome_page_url: tier?.welcome_page_url || null
         },
+        savingDelay: 500,
+        savedDelay: 500,
+        onValidate: () => {
+            const newErrors: ErrorMessages = {};
+
+            Object.entries(validators).forEach(([key, validator]) => {
+                newErrors[key as keyof Tier] = validator?.();
+            });
+
+            return newErrors;
+        },
         onSave: async () => {
             const {trial_days: trialDays, currency, ...rest} = formState;
             const values: Partial<Tier> = rest;
@@ -72,16 +70,22 @@ const TierDetailModalContent: React.FC<{tier?: Tier}> = ({tier}) => {
             } else {
                 await createTier(values);
             }
-
+        },
+        onSavedStateReset: () => {
             modal.remove();
+            updateRoute('tiers');
         },
         onSaveError: handleError
     });
 
-    const validators = {
-        name: () => setError('name', formState.name ? undefined : 'You must specify a name'),
-        monthly_price: () => formState.type !== 'free' && setError('monthly_price', validateCurrencyAmount(formState.monthly_price || 0, formState.currency, {allowZero: false})),
-        yearly_price: () => formState.type !== 'free' && setError('yearly_price', validateCurrencyAmount(formState.yearly_price || 0, formState.currency, {allowZero: false}))
+    const validateField = (key: string) => {
+        const error = validators[key as keyof Tier]?.();
+
+        if (error) {
+            setErrors({...errors, [key]: error});
+        } else {
+            clearError(key);
+        }
     };
 
     const benefits = useSortableIndexedList({
@@ -105,8 +109,8 @@ const TierDetailModalContent: React.FC<{tier?: Tier}> = ({tier}) => {
     const didInitialRender = useRef(false);
     useEffect(() => {
         if (didInitialRender.current) {
-            validators.monthly_price();
-            validators.yearly_price();
+            validators.monthly_price?.();
+            validators.yearly_price?.();
         }
 
         didInitialRender.current = true;
@@ -117,7 +121,7 @@ const TierDetailModalContent: React.FC<{tier?: Tier}> = ({tier}) => {
             const promptTitle = tier.active ? 'Archive tier' : 'Reactivate tier';
             const prompt = tier.active ? <>
                 <div className='mb-6'>Members will no longer be able to subscribe to <strong>{tier.name}</strong> and it will be removed from the list of available tiers in portal.</div>
-                <div>Existing members on this tier will remain unchanged.</div>
+                <div>Existing members on this tier will remain unchanged. Offers using this tier will be disabled.</div>
             </> : <>
                 <div className='mb-6'>Reactivating <strong>{tier.name}</strong> will re-enable it as an option in portal and allow new members to subscribe to this tier.</div>
                 <div>Existing members will remain unchanged.</div>
@@ -164,9 +168,11 @@ const TierDetailModalContent: React.FC<{tier?: Tier}> = ({tier}) => {
         afterClose={() => {
             updateRoute('tiers');
         }}
+        buttonsDisabled={okProps.disabled}
         dirty={saveState === 'unsaved'}
         leftButtonProps={leftButtonProps}
-        okLabel='Save & close'
+        okColor={okProps.color}
+        okLabel={okProps.label || 'Save & close'}
         size='lg'
         testId='tier-detail-modal'
         title={(tier ? (tier.active ? 'Edit tier' : 'Edit archived tier') : 'New tier')}
@@ -174,22 +180,13 @@ const TierDetailModalContent: React.FC<{tier?: Tier}> = ({tier}) => {
         onOk={async () => {
             toast.remove();
 
-            if (Object.values(validators).filter(validator => validator()).length) {
+            if (!await handleSave({fakeWhenUnchanged: true})) {
                 showToast({
                     type: 'pageError',
                     message: 'Can\'t save tier, please double check that you\'ve filled all mandatory fields.'
                 });
                 return;
             }
-
-            if (saveState !== 'unsaved') {
-                updateRoute('tiers');
-                modal.remove();
-            }
-
-            if (await handleSave()) {
-                updateRoute('tiers');
-            }
         }}
     >
         <div className='-mb-8 mt-8 flex items-start gap-8'>
@@ -203,7 +200,7 @@ const TierDetailModalContent: React.FC<{tier?: Tier}> = ({tier}) => {
                         title='Name'
                         value={formState.name || ''}
                         autoFocus
-                        onBlur={() => validators.name()}
+                        onBlur={() => validateField('name')}
                         onChange={e => updateForm(state => ({...state, name: e.target.value}))}
                     />}
                     <TextField
@@ -243,7 +240,7 @@ const TierDetailModalContent: React.FC<{tier?: Tier}> = ({tier}) => {
                                         title='Monthly price'
                                         valueInCents={formState.monthly_price || ''}
                                         hideTitle
-                                        onBlur={() => validators.monthly_price()}
+                                        onBlur={() => validateField('monthly_price')}
                                         onChange={price => updateForm(state => ({...state, monthly_price: price}))}
                                     />
                                     <CurrencyField
@@ -254,7 +251,7 @@ const TierDetailModalContent: React.FC<{tier?: Tier}> = ({tier}) => {
                                         title='Yearly price'
                                         valueInCents={formState.yearly_price || ''}
                                         hideTitle
-                                        onBlur={() => validators.yearly_price()}
+                                        onBlur={() => validateField('yearly_price')}
                                         onChange={price => updateForm(state => ({...state, yearly_price: price}))}
                                     />
                                 </div>
diff --git a/apps/admin-x-settings/src/components/settings/membership/tiers/TierDetailPreview.tsx b/apps/admin-x-settings/src/components/settings/membership/tiers/TierDetailPreview.tsx
index 9bd9d56f3e4..9b6624d07ee 100644
--- a/apps/admin-x-settings/src/components/settings/membership/tiers/TierDetailPreview.tsx
+++ b/apps/admin-x-settings/src/components/settings/membership/tiers/TierDetailPreview.tsx
@@ -1,9 +1,7 @@
-import Button from '../../../../admin-x-ds/global/Button';
-import Heading from '../../../../admin-x-ds/global/Heading';
-import Icon from '../../../../admin-x-ds/global/Icon';
 import React, {useState} from 'react';
 import clsx from 'clsx';
 import useSettingGroup from '../../../../hooks/useSettingGroup';
+import {Button, Heading, Icon} from '@tryghost/admin-x-design-system';
 import {TierFormState} from './TierDetailModal';
 import {currencyToDecimal, getSymbol} from '../../../../utils/currency';
 import {getSettingValues} from '../../../../api/settings';
diff --git a/apps/admin-x-settings/src/components/settings/membership/tiers/TiersList.tsx b/apps/admin-x-settings/src/components/settings/membership/tiers/TiersList.tsx
index a0f437f61d7..28340d0dbc4 100644
--- a/apps/admin-x-settings/src/components/settings/membership/tiers/TiersList.tsx
+++ b/apps/admin-x-settings/src/components/settings/membership/tiers/TiersList.tsx
@@ -1,8 +1,7 @@
-import Icon from '../../../../admin-x-ds/global/Icon';
-import NoValueLabel from '../../../../admin-x-ds/global/NoValueLabel';
 import React from 'react';
 import clsx from 'clsx';
 import useRouting from '../../../../hooks/useRouting';
+import {Icon, NoValueLabel} from '@tryghost/admin-x-design-system';
 import {Tier} from '../../../../api/tiers';
 import {TrialDaysLabel} from './TierDetailPreview';
 import {currencyToDecimal, getSymbol} from '../../../../utils/currency';
diff --git a/apps/admin-x-settings/src/components/settings/site/AnnouncementBar.tsx b/apps/admin-x-settings/src/components/settings/site/AnnouncementBar.tsx
index 51df5ebdf03..9aedd1e967c 100644
--- a/apps/admin-x-settings/src/components/settings/site/AnnouncementBar.tsx
+++ b/apps/admin-x-settings/src/components/settings/site/AnnouncementBar.tsx
@@ -1,8 +1,7 @@
-import Button from '../../../admin-x-ds/global/Button';
 import React from 'react';
-import SettingGroup from '../../../admin-x-ds/settings/SettingGroup';
+import TopLevelGroup from '../../TopLevelGroup';
 import useRouting from '../../../hooks/useRouting';
-import {withErrorBoundary} from '../../../admin-x-ds/global/ErrorBoundary';
+import {Button, withErrorBoundary} from '@tryghost/admin-x-design-system';
 
 const AnnouncementBar: React.FC<{ keywords: string[] }> = ({keywords}) => {
     const {updateRoute} = useRouting();
@@ -11,7 +10,7 @@ const AnnouncementBar: React.FC<{ keywords: string[] }> = ({keywords}) => {
     };
 
     return (
-        <SettingGroup
+        <TopLevelGroup
             customButtons={<Button color='green' label='Customize' link linkWithPadding onClick={openModal}/>}
             description="Highlight important updates or offers"
             keywords={keywords}
diff --git a/apps/admin-x-settings/src/components/settings/site/AnnouncementBarModal.tsx b/apps/admin-x-settings/src/components/settings/site/AnnouncementBarModal.tsx
index abbb19cecd4..6f862384905 100644
--- a/apps/admin-x-settings/src/components/settings/site/AnnouncementBarModal.tsx
+++ b/apps/admin-x-settings/src/components/settings/site/AnnouncementBarModal.tsx
@@ -1,17 +1,11 @@
 import AnnouncementBarPreview from './announcementBar/AnnouncementBarPreview';
-import CheckboxGroup from '../../../admin-x-ds/global/form/CheckboxGroup';
-import ColorIndicator from '../../../admin-x-ds/global/form/ColorIndicator';
-import Form from '../../../admin-x-ds/global/form/Form';
-import HtmlField from '../../../admin-x-ds/global/form/HtmlField';
 import NiceModal from '@ebay/nice-modal-react';
 import React, {useCallback, useState} from 'react';
 import useRouting from '../../../hooks/useRouting';
 import useSettingGroup from '../../../hooks/useSettingGroup';
-import {PreviewModalContent} from '../../../admin-x-ds/global/modal/PreviewModal';
-import {Tab} from '../../../admin-x-ds/global/TabView';
+import {CheckboxGroup, ColorIndicator, Form, HtmlField, PreviewModalContent, Tab, showToast} from '@tryghost/admin-x-design-system';
 import {getHomepageUrl} from '../../../api/site';
 import {getSettingValues} from '../../../api/settings';
-import {showToast} from '../../../admin-x-ds/global/Toast';
 import {useBrowsePosts} from '../../../api/posts';
 import {useGlobalData} from '../../providers/GlobalDataProvider';
 
@@ -115,7 +109,7 @@ const Sidebar: React.FC<SidebarProps> = ({
 
 const AnnouncementBarModal: React.FC = () => {
     const {siteData} = useGlobalData();
-    const {localSettings, updateSetting, handleSave} = useSettingGroup();
+    const {localSettings, updateSetting, handleSave, okProps} = useSettingGroup({savingDelay: 500});
     const [announcementContent] = getSettingValues<string>(localSettings, ['announcement_content']);
     const [accentColor] = getSettingValues<string>(localSettings, ['accent_color']);
     const [announcementBackgroundColor] = getSettingValues<string>(localSettings, ['announcement_background']);
@@ -208,10 +202,12 @@ const AnnouncementBarModal: React.FC = () => {
         afterClose={() => {
             updateRoute('announcement-bar');
         }}
+        buttonsDisabled={okProps.disabled}
         cancelLabel='Close'
         deviceSelector={true}
         dirty={false}
-        okLabel='Save'
+        okColor={okProps.color}
+        okLabel={okProps.label || 'Save'}
         preview={preview}
         previewBgColor='greygradient'
         previewToolbarTabs={previewTabs}
@@ -221,8 +217,7 @@ const AnnouncementBarModal: React.FC = () => {
         title='Announcement'
         titleHeadingLevel={5}
         onOk={async () => {
-            if (!(await handleSave())) {
-                updateRoute('announcement-bar');
+            if (!(await handleSave({fakeWhenUnchanged: true}))) {
                 showToast({
                     type: 'pageError',
                     message: 'An error occurred while saving your changes. Please try again.'
diff --git a/apps/admin-x-settings/src/components/settings/site/DesignModal.tsx b/apps/admin-x-settings/src/components/settings/site/DesignModal.tsx
index 444de06a70f..38ea744abeb 100644
--- a/apps/admin-x-settings/src/components/settings/site/DesignModal.tsx
+++ b/apps/admin-x-settings/src/components/settings/site/DesignModal.tsx
@@ -1,17 +1,12 @@
 import BrandSettings, {BrandSettingValues} from './designAndBranding/BrandSettings';
-// import Button from '../../../admin-x-ds/global/Button';
-// import ChangeThemeModal from './ThemeModal';
-import Icon from '../../../admin-x-ds/global/Icon';
 import React, {useEffect, useState} from 'react';
-import StickyFooter from '../../../admin-x-ds/global/StickyFooter';
-import TabView, {Tab} from '../../../admin-x-ds/global/TabView';
 import ThemePreview from './designAndBranding/ThemePreview';
 import ThemeSettings from './designAndBranding/ThemeSettings';
 import useForm from '../../../hooks/useForm';
 import useHandleError from '../../../utils/api/handleError';
 import useRouting from '../../../hooks/useRouting';
 import {CustomThemeSetting, useBrowseCustomThemeSettings, useEditCustomThemeSettings} from '../../../api/customThemeSettings';
-import {PreviewModalContent} from '../../../admin-x-ds/global/modal/PreviewModal';
+import {Icon, PreviewModalContent, StickyFooter, Tab, TabView} from '@tryghost/admin-x-design-system';
 import {Setting, SettingValue, getSettingValues, useEditSettings} from '../../../api/settings';
 import {getHomepageUrl} from '../../../api/site';
 import {useBrowsePosts} from '../../../api/posts';
@@ -102,21 +97,23 @@ const DesignModal: React.FC = () => {
         saveState,
         handleSave,
         updateForm,
-        setFormState
+        setFormState,
+        okProps
     } = useForm({
         initialState: {
             settings: settings as Array<Setting & { dirty?: boolean }>,
             themeSettings: themeSettings ? (themeSettings.custom_theme_settings as Array<CustomThemeSetting & { dirty?: boolean }>) : undefined
         },
+        savingDelay: 500,
         onSave: async () => {
             if (formState.themeSettings?.some(setting => setting.dirty)) {
                 const response = await editThemeSettings(formState.themeSettings);
-                updateForm(state => ({...state, themeSettings: response.custom_theme_settings}));
+                setFormState(state => ({...state, themeSettings: response.custom_theme_settings}));
             }
 
             if (formState.settings.some(setting => setting.dirty)) {
                 const {settings: newSettings} = await editSettings(formState.settings.filter(setting => setting.dirty));
-                updateForm(state => ({...state, settings: newSettings}));
+                setFormState(state => ({...state, settings: newSettings}));
             }
         },
         onSaveError: handleError
@@ -215,12 +212,12 @@ const DesignModal: React.FC = () => {
         afterClose={() => {
             updateRoute('design');
         }}
-        buttonsDisabled={saveState === 'saving'}
+        buttonsDisabled={okProps.disabled}
         cancelLabel='Close'
         defaultTab='homepage'
         dirty={saveState === 'unsaved'}
-        okColor={saveState === 'saved' ? 'green' : 'black'}
-        okLabel={saveState === 'saved' ? 'Saved' : (saveState === 'saving' ? 'Saving...' : 'Save')}
+        okColor={okProps.color}
+        okLabel={okProps.label || 'Save'}
         preview={previewContent}
         previewToolbarTabs={previewTabs}
         selectedURL={selectedPreviewTab}
@@ -231,7 +228,7 @@ const DesignModal: React.FC = () => {
         testId='design-modal'
         title='Design'
         onOk={async () => {
-            await handleSave();
+            await handleSave({fakeWhenUnchanged: true});
         }}
         onSelectURL={onSelectURL}
     />;
diff --git a/apps/admin-x-settings/src/components/settings/site/DesignSetting.tsx b/apps/admin-x-settings/src/components/settings/site/DesignSetting.tsx
index 8b85197d9f2..7a2db287b89 100644
--- a/apps/admin-x-settings/src/components/settings/site/DesignSetting.tsx
+++ b/apps/admin-x-settings/src/components/settings/site/DesignSetting.tsx
@@ -1,8 +1,7 @@
-import Button from '../../../admin-x-ds/global/Button';
 import React from 'react';
-import SettingGroup from '../../../admin-x-ds/settings/SettingGroup';
+import TopLevelGroup from '../../TopLevelGroup';
 import useRouting from '../../../hooks/useRouting';
-import {withErrorBoundary} from '../../../admin-x-ds/global/ErrorBoundary';
+import {Button, withErrorBoundary} from '@tryghost/admin-x-design-system';
 
 const DesignSetting: React.FC<{ keywords: string[] }> = ({keywords}) => {
     const {updateRoute} = useRouting();
@@ -11,7 +10,7 @@ const DesignSetting: React.FC<{ keywords: string[] }> = ({keywords}) => {
     };
 
     return (
-        <SettingGroup
+        <TopLevelGroup
             customButtons={<Button color='green' label='Customize' link linkWithPadding onClick={openPreviewModal}/>}
             description="Customize the theme, colors, and layout of your site"
             keywords={keywords}
diff --git a/apps/admin-x-settings/src/components/settings/site/Navigation.tsx b/apps/admin-x-settings/src/components/settings/site/Navigation.tsx
index 2ad07ed7320..da2b117c619 100644
--- a/apps/admin-x-settings/src/components/settings/site/Navigation.tsx
+++ b/apps/admin-x-settings/src/components/settings/site/Navigation.tsx
@@ -1,8 +1,7 @@
-import Button from '../../../admin-x-ds/global/Button';
 import React from 'react';
-import SettingGroup from '../../../admin-x-ds/settings/SettingGroup';
+import TopLevelGroup from '../../TopLevelGroup';
 import useRouting from '../../../hooks/useRouting';
-import {withErrorBoundary} from '../../../admin-x-ds/global/ErrorBoundary';
+import {Button, withErrorBoundary} from '@tryghost/admin-x-design-system';
 
 const Navigation: React.FC<{ keywords: string[] }> = ({keywords}) => {
     const {updateRoute} = useRouting();
@@ -11,7 +10,7 @@ const Navigation: React.FC<{ keywords: string[] }> = ({keywords}) => {
     };
 
     return (
-        <SettingGroup
+        <TopLevelGroup
             customButtons={<Button color='green' label='Customize' link linkWithPadding onClick={openPreviewModal}/>}
             description="Set up primary and secondary menus"
             keywords={keywords}
diff --git a/apps/admin-x-settings/src/components/settings/site/NavigationModal.tsx b/apps/admin-x-settings/src/components/settings/site/NavigationModal.tsx
index f62618787fd..cc776a4a51e 100644
--- a/apps/admin-x-settings/src/components/settings/site/NavigationModal.tsx
+++ b/apps/admin-x-settings/src/components/settings/site/NavigationModal.tsx
@@ -1,10 +1,9 @@
-import Modal from '../../../admin-x-ds/global/modal/Modal';
 import NavigationEditForm from './navigation/NavigationEditForm';
 import NiceModal, {useModal} from '@ebay/nice-modal-react';
-import TabView from '../../../admin-x-ds/global/TabView';
 import useNavigationEditor, {NavigationItem} from '../../../hooks/site/useNavigationEditor';
 import useRouting from '../../../hooks/useRouting';
 import useSettingGroup from '../../../hooks/useSettingGroup';
+import {Modal, TabView} from '@tryghost/admin-x-design-system';
 import {getSettingValues} from '../../../api/settings';
 import {useState} from 'react';
 
@@ -45,6 +44,7 @@ const NavigationModal = NiceModal.create(() => {
             }}
             buttonsDisabled={saveState === 'saving'}
             dirty={localSettings.some(setting => setting.dirty)}
+            okLabel={saveState === 'saving' ? 'Saving...' : 'OK'}
             scrolling={true}
             size='lg'
             stickyFooter={true}
diff --git a/apps/admin-x-settings/src/components/settings/site/SiteSettings.tsx b/apps/admin-x-settings/src/components/settings/site/SiteSettings.tsx
index 6feb892d7d2..0daaa1ae547 100644
--- a/apps/admin-x-settings/src/components/settings/site/SiteSettings.tsx
+++ b/apps/admin-x-settings/src/components/settings/site/SiteSettings.tsx
@@ -2,22 +2,22 @@ import AnnouncementBar from './AnnouncementBar';
 import DesignSetting from './DesignSetting';
 import Navigation from './Navigation';
 import React from 'react';
-import SettingSection from '../../../admin-x-ds/settings/SettingSection';
+import SearchableSection from '../../SearchableSection';
 
 export const searchKeywords = {
-    design: ['logo', 'cover', 'colors', 'fonts', 'background', 'themes', 'appearance', 'style', 'design & branding', 'design and branding'],
-    navigation: ['navigation', 'menus', 'primary', 'secondary', 'links'],
-    announcementBar: ['announcement bar', 'important', 'banner']
+    design: ['site', 'logo', 'cover', 'colors', 'fonts', 'background', 'themes', 'appearance', 'style', 'design & branding', 'design and branding'],
+    navigation: ['site', 'navigation', 'menus', 'primary', 'secondary', 'links'],
+    announcementBar: ['site', 'announcement bar', 'important', 'banner']
 };
 
 const SiteSettings: React.FC = () => {
     return (
         <>
-            <SettingSection keywords={Object.values(searchKeywords).flat()} title="Site">
+            <SearchableSection keywords={Object.values(searchKeywords).flat()} title="Site">
                 <DesignSetting keywords={searchKeywords.design} />
                 <Navigation keywords={searchKeywords.navigation} />
                 <AnnouncementBar keywords={searchKeywords.announcementBar} />
-            </SettingSection>
+            </SearchableSection>
         </>
     );
 };
diff --git a/apps/admin-x-settings/src/components/settings/site/ThemeModal.tsx b/apps/admin-x-settings/src/components/settings/site/ThemeModal.tsx
index b0402114aef..af0961cc4a6 100644
--- a/apps/admin-x-settings/src/components/settings/site/ThemeModal.tsx
+++ b/apps/admin-x-settings/src/components/settings/site/ThemeModal.tsx
@@ -1,24 +1,16 @@
 import AdvancedThemeSettings from './theme/AdvancedThemeSettings';
-import Breadcrumbs from '../../../admin-x-ds/global/Breadcrumbs';
-import Button from '../../../admin-x-ds/global/Button';
-import ConfirmationModal from '../../../admin-x-ds/global/modal/ConfirmationModal';
-import FileUpload from '../../../admin-x-ds/global/form/FileUpload';
 import InvalidThemeModal from './theme/InvalidThemeModal';
-import LimitModal from '../../../admin-x-ds/global/modal/LimitModal';
-import Modal from '../../../admin-x-ds/global/modal/Modal';
 import NiceModal, {NiceModalHandler, useModal} from '@ebay/nice-modal-react';
 import OfficialThemes from './theme/OfficialThemes';
-import PageHeader from '../../../admin-x-ds/global/layout/PageHeader';
 import React, {useEffect, useRef, useState} from 'react';
-import TabView from '../../../admin-x-ds/global/TabView';
 import ThemeInstalledModal from './theme/ThemeInstalledModal';
 import ThemePreview from './theme/ThemePreview';
 import useHandleError from '../../../utils/api/handleError';
 import useRouting from '../../../hooks/useRouting';
+import {Breadcrumbs, Button, ConfirmationModal, FileUpload, LimitModal, Modal, PageHeader, TabView, showToast} from '@tryghost/admin-x-design-system';
 import {HostLimitError, useLimiter} from '../../../hooks/useLimiter';
 import {InstalledTheme, Theme, ThemesInstallResponseType, isDefaultOrLegacyTheme, useActivateTheme, useBrowseThemes, useInstallTheme, useUploadTheme} from '../../../api/themes';
 import {OfficialTheme} from '../../providers/ServiceProvider';
-import {showToast} from '../../../admin-x-ds/global/Toast';
 
 interface ThemeToolbarProps {
     selectedTheme: OfficialTheme|null;
diff --git a/apps/admin-x-settings/src/components/settings/site/designAndBranding/BrandSettings.tsx b/apps/admin-x-settings/src/components/settings/site/designAndBranding/BrandSettings.tsx
index 87642ddd5b7..0f2f3c05af2 100644
--- a/apps/admin-x-settings/src/components/settings/site/designAndBranding/BrandSettings.tsx
+++ b/apps/admin-x-settings/src/components/settings/site/designAndBranding/BrandSettings.tsx
@@ -1,15 +1,9 @@
-import ColorPickerField from '../../../../admin-x-ds/global/form/ColorPickerField';
-import Heading from '../../../../admin-x-ds/global/Heading';
-import Hint from '../../../../admin-x-ds/global/Hint';
-import ImageUpload from '../../../../admin-x-ds/global/form/ImageUpload';
 import React, {useRef, useState} from 'react';
-import SettingGroupContent from '../../../../admin-x-ds/settings/SettingGroupContent';
-import TextField from '../../../../admin-x-ds/global/form/TextField';
 import UnsplashSearchModal from '../../../../unsplash/UnsplashSearchModal';
 import useHandleError from '../../../../utils/api/handleError';
 import usePinturaEditor from '../../../../hooks/usePinturaEditor';
+import {ColorPickerField, Heading, Hint, ImageUpload, SettingGroupContent, TextField, debounce} from '@tryghost/admin-x-design-system';
 import {SettingValue, getSettingValues} from '../../../../api/settings';
-import {debounce} from '../../../../utils/debounce';
 import {getImageUrl, useUploadImage} from '../../../../api/images';
 import {useGlobalData} from '../../../providers/GlobalDataProvider';
 import {useServices} from '../../../providers/ServiceProvider';
@@ -27,8 +21,6 @@ const BrandSettings: React.FC<{ values: BrandSettingValues, updateSetting: (key:
     const [siteDescription, setSiteDescription] = useState(values.description);
     const {settings} = useGlobalData();
     const [unsplashEnabled] = getSettingValues<boolean>(settings, ['unsplash']);
-    const [pinturaJsUrl] = getSettingValues<string>(settings, ['pintura_js_url']);
-    const [pinturaCssUrl] = getSettingValues<string>(settings, ['pintura_css_url']);
     const [showUnsplash, setShowUnsplash] = useState<boolean>(false);
     const {unsplashConfig} = useServices();
     const handleError = useHandleError();
@@ -39,12 +31,7 @@ const BrandSettings: React.FC<{ values: BrandSettingValues, updateSetting: (key:
         }, 500)
     );
 
-    const editor = usePinturaEditor(
-        {config: {
-            jsUrl: pinturaJsUrl || '',
-            cssUrl: pinturaCssUrl || ''
-        }}
-    );
+    const editor = usePinturaEditor();
 
     return (
         <div className='mt-7'>
diff --git a/apps/admin-x-settings/src/components/settings/site/designAndBranding/ThemeSettings.tsx b/apps/admin-x-settings/src/components/settings/site/designAndBranding/ThemeSettings.tsx
index fb0508f0752..1fd2cca8b2c 100644
--- a/apps/admin-x-settings/src/components/settings/site/designAndBranding/ThemeSettings.tsx
+++ b/apps/admin-x-settings/src/components/settings/site/designAndBranding/ThemeSettings.tsx
@@ -1,13 +1,6 @@
-import ColorPickerField from '../../../../admin-x-ds/global/form/ColorPickerField';
-import Heading from '../../../../admin-x-ds/global/Heading';
-import Hint from '../../../../admin-x-ds/global/Hint';
-import ImageUpload from '../../../../admin-x-ds/global/form/ImageUpload';
 import React from 'react';
-import Select from '../../../../admin-x-ds/global/form/Select';
-import SettingGroupContent from '../../../../admin-x-ds/settings/SettingGroupContent';
-import TextField from '../../../../admin-x-ds/global/form/TextField';
-import Toggle from '../../../../admin-x-ds/global/form/Toggle';
 import useHandleError from '../../../../utils/api/handleError';
+import {ColorPickerField, Heading, Hint, ImageUpload, Select, SettingGroupContent, TextField, Toggle} from '@tryghost/admin-x-design-system';
 import {CustomThemeSetting} from '../../../../api/customThemeSettings';
 import {getImageUrl, useUploadImage} from '../../../../api/images';
 import {humanizeSettingKey} from '../../../../api/settings';
diff --git a/apps/admin-x-settings/src/components/settings/site/navigation/NavigationEditForm.tsx b/apps/admin-x-settings/src/components/settings/site/navigation/NavigationEditForm.tsx
index 11d16668179..04692647c89 100644
--- a/apps/admin-x-settings/src/components/settings/site/navigation/NavigationEditForm.tsx
+++ b/apps/admin-x-settings/src/components/settings/site/navigation/NavigationEditForm.tsx
@@ -1,8 +1,6 @@
-import Button from '../../../../admin-x-ds/global/Button';
-import Icon from '../../../../admin-x-ds/global/Icon';
 import NavigationItemEditor from './NavigationItemEditor';
 import React from 'react';
-import SortableList from '../../../../admin-x-ds/global/SortableList';
+import {Button, Icon, SortableList} from '@tryghost/admin-x-design-system';
 import {NavigationEditor} from '../../../../hooks/site/useNavigationEditor';
 
 const NavigationEditForm: React.FC<{
diff --git a/apps/admin-x-settings/src/components/settings/site/navigation/NavigationItemEditor.tsx b/apps/admin-x-settings/src/components/settings/site/navigation/NavigationItemEditor.tsx
index 8ef5fc89165..ef576008cce 100644
--- a/apps/admin-x-settings/src/components/settings/site/navigation/NavigationItemEditor.tsx
+++ b/apps/admin-x-settings/src/components/settings/site/navigation/NavigationItemEditor.tsx
@@ -1,8 +1,7 @@
 import React, {ReactNode} from 'react';
-import TextField from '../../../../admin-x-ds/global/form/TextField';
-import URLTextField from '../../../../admin-x-ds/global/form/URLTextField';
 import clsx from 'clsx';
 import {EditableItem, NavigationItem, NavigationItemErrors} from '../../../../hooks/site/useNavigationEditor';
+import {TextField, URLTextField} from '@tryghost/admin-x-design-system';
 
 export type NavigationItemEditorProps = React.HTMLAttributes<HTMLDivElement> & {
     baseUrl: string;
diff --git a/apps/admin-x-settings/src/components/settings/site/theme/AdvancedThemeSettings.tsx b/apps/admin-x-settings/src/components/settings/site/theme/AdvancedThemeSettings.tsx
index bc0565cdaff..b89a1f8ad4b 100644
--- a/apps/admin-x-settings/src/components/settings/site/theme/AdvancedThemeSettings.tsx
+++ b/apps/admin-x-settings/src/components/settings/site/theme/AdvancedThemeSettings.tsx
@@ -1,12 +1,7 @@
-import Button, {ButtonProps} from '../../../../admin-x-ds/global/Button';
-import ConfirmationModal from '../../../../admin-x-ds/global/modal/ConfirmationModal';
-import List from '../../../../admin-x-ds/global/List';
-import ListItem from '../../../../admin-x-ds/global/ListItem';
-import Menu from '../../../../admin-x-ds/global/Menu';
-import ModalPage from '../../../../admin-x-ds/global/modal/ModalPage';
 import NiceModal from '@ebay/nice-modal-react';
 import React from 'react';
 import useHandleError from '../../../../utils/api/handleError';
+import {Button, ButtonProps, ConfirmationModal, List, ListItem, Menu, ModalPage} from '@tryghost/admin-x-design-system';
 import {Theme, isActiveTheme, isDefaultTheme, isDeletableTheme, isLegacyTheme, useActivateTheme, useDeleteTheme} from '../../../../api/themes';
 import {downloadFile, getGhostPaths} from '../../../../utils/helpers';
 
@@ -130,6 +125,7 @@ const ThemeActions: React.FC<ThemeActionProps> = ({
     }
 
     const buttonProps: ButtonProps = {
+        iconColorClass: 'text-base',
         size: 'sm'
     };
 
diff --git a/apps/admin-x-settings/src/components/settings/site/theme/InvalidThemeModal.tsx b/apps/admin-x-settings/src/components/settings/site/theme/InvalidThemeModal.tsx
index cef2adfa530..0fc4a35cf2e 100644
--- a/apps/admin-x-settings/src/components/settings/site/theme/InvalidThemeModal.tsx
+++ b/apps/admin-x-settings/src/components/settings/site/theme/InvalidThemeModal.tsx
@@ -1,10 +1,6 @@
-import Button from '../../../../admin-x-ds/global/Button';
-import Heading from '../../../../admin-x-ds/global/Heading';
-import List from '../../../../admin-x-ds/global/List';
-import ListItem from '../../../../admin-x-ds/global/ListItem';
 import NiceModal from '@ebay/nice-modal-react';
 import React, {ReactNode, useState} from 'react';
-import {ConfirmationModalContent} from '../../../../admin-x-ds/global/modal/ConfirmationModal';
+import {Button, ConfirmationModalContent, Heading, List, ListItem} from '@tryghost/admin-x-design-system';
 import {ThemeProblem} from '../../../../api/themes';
 
 type FatalError = {
diff --git a/apps/admin-x-settings/src/components/settings/site/theme/OfficialThemes.tsx b/apps/admin-x-settings/src/components/settings/site/theme/OfficialThemes.tsx
index 35cee6fa251..fe323f65900 100644
--- a/apps/admin-x-settings/src/components/settings/site/theme/OfficialThemes.tsx
+++ b/apps/admin-x-settings/src/components/settings/site/theme/OfficialThemes.tsx
@@ -1,8 +1,7 @@
-import Heading from '../../../../admin-x-ds/global/Heading';
 import MarketplaceBgImage from '../../../../assets/images/footer-marketplace-bg.png';
-import ModalPage from '../../../../admin-x-ds/global/modal/ModalPage';
 import React, {useEffect, useState} from 'react';
 import clsx from 'clsx';
+import {Heading, ModalPage} from '@tryghost/admin-x-design-system';
 import {OfficialTheme, ThemeVariant, useOfficialThemes} from '../../../providers/ServiceProvider';
 import {getGhostPaths, resolveAsset} from '../../../../utils/helpers';
 
diff --git a/apps/admin-x-settings/src/components/settings/site/theme/ThemeInstalledModal.tsx b/apps/admin-x-settings/src/components/settings/site/theme/ThemeInstalledModal.tsx
index ab4472d2189..da2a879f5eb 100644
--- a/apps/admin-x-settings/src/components/settings/site/theme/ThemeInstalledModal.tsx
+++ b/apps/admin-x-settings/src/components/settings/site/theme/ThemeInstalledModal.tsx
@@ -1,13 +1,8 @@
-import Button from '../../../../admin-x-ds/global/Button';
-import Heading from '../../../../admin-x-ds/global/Heading';
-import List from '../../../../admin-x-ds/global/List';
-import ListItem from '../../../../admin-x-ds/global/ListItem';
 import NiceModal from '@ebay/nice-modal-react';
 import React, {ReactNode, useState} from 'react';
 import useHandleError from '../../../../utils/api/handleError';
-import {ConfirmationModalContent} from '../../../../admin-x-ds/global/modal/ConfirmationModal';
+import {Button, ConfirmationModalContent, Heading, List, ListItem, showToast} from '@tryghost/admin-x-design-system';
 import {InstalledTheme, ThemeProblem, useActivateTheme} from '../../../../api/themes';
-import {showToast} from '../../../../admin-x-ds/global/Toast';
 
 export const ThemeProblemView = ({problem}:{problem: ThemeProblem}) => {
     const [isExpanded, setExpanded] = useState(false);
diff --git a/apps/admin-x-settings/src/components/settings/site/theme/ThemePreview.tsx b/apps/admin-x-settings/src/components/settings/site/theme/ThemePreview.tsx
index 4691380f52c..cf994e7ceda 100644
--- a/apps/admin-x-settings/src/components/settings/site/theme/ThemePreview.tsx
+++ b/apps/admin-x-settings/src/components/settings/site/theme/ThemePreview.tsx
@@ -1,13 +1,6 @@
-import Breadcrumbs from '../../../../admin-x-ds/global/Breadcrumbs';
-import Button from '../../../../admin-x-ds/global/Button';
-import ButtonGroup from '../../../../admin-x-ds/global/ButtonGroup';
-import ConfirmationModal from '../../../../admin-x-ds/global/modal/ConfirmationModal';
-import DesktopChrome from '../../../../admin-x-ds/global/chrome/DesktopChrome';
-import MobileChrome from '../../../../admin-x-ds/global/chrome/MobileChrome';
 import NiceModal from '@ebay/nice-modal-react';
-import PageHeader from '../../../../admin-x-ds/global/layout/PageHeader';
 import React, {useState} from 'react';
-import Select, {SelectOption} from '../../../../admin-x-ds/global/form/Select';
+import {Breadcrumbs, Button, ButtonGroup, ConfirmationModal, DesktopChrome, MobileChrome, PageHeader, Select, SelectOption} from '@tryghost/admin-x-design-system';
 import {OfficialTheme, ThemeVariant} from '../../../providers/ServiceProvider';
 import {Theme, isDefaultOrLegacyTheme} from '../../../../api/themes';
 
diff --git a/apps/admin-x-settings/src/hooks/useForm.ts b/apps/admin-x-settings/src/hooks/useForm.ts
index a566dd3b5d4..d30657813a4 100644
--- a/apps/admin-x-settings/src/hooks/useForm.ts
+++ b/apps/admin-x-settings/src/hooks/useForm.ts
@@ -1,3 +1,4 @@
+import {ButtonColor} from '@tryghost/admin-x-design-system';
 import {useCallback, useEffect, useState} from 'react';
 
 export type Dirtyable<Data> = Data & {
@@ -8,13 +9,21 @@ export type SaveState = 'unsaved' | 'saving' | 'saved' | 'error' | '';
 
 export type ErrorMessages = Record<string, string | undefined>
 
+export interface OkProps {
+    disabled: boolean;
+    color: ButtonColor;
+    label?: string;
+}
+
+export type SaveHandler = (options?: {force?: boolean; fakeWhenUnchanged?: boolean}) => Promise<boolean>
+
 export interface FormHook<State> {
     formState: State;
     saveState: SaveState;
     /**
      * Validate and save the state. Use the `force` option to save even when there are no changes made (e.g., initial state should be saveable)
      */
-    handleSave: (options?: {force?: boolean}) => Promise<boolean>;
+    handleSave: SaveHandler;
     /**
      * Update the form state and mark the form as dirty. Should be used in input events
      */
@@ -30,26 +39,33 @@ export interface FormHook<State> {
     isValid: boolean;
     errors: ErrorMessages;
     setErrors: (errors: ErrorMessages) => void;
+
+    okProps: OkProps;
 }
 
-const useForm = <State>({initialState, onSave, onSaveError, onValidate}: {
-    initialState: State,
-    onSave: (state: State) => void | Promise<void>
-    onSaveError?: (error: unknown) => void | Promise<void>
-    onValidate?: (state: State) => ErrorMessages
+const useForm = <State>({initialState, savingDelay, savedDelay = 2000, onSave, onSaveError, onSavedStateReset: onSaveCompleted, onValidate}: {
+    initialState: State;
+    savingDelay?: number;
+    savedDelay?: number;
+    onSave: (state: State) => void | Promise<void>;
+    onSaveError?: (error: unknown) => void | Promise<void>;
+    onSavedStateReset?: () => void;
+    onValidate?: (state: State) => ErrorMessages;
 }): FormHook<State> => {
     const [formState, setFormState] = useState(initialState);
     const [saveState, setSaveState] = useState<SaveState>('');
     const [errors, setErrors] = useState<ErrorMessages>({});
 
-    // Reset saved state after 2 seconds
+    // Reset saved state after a delay
+    // To prevent infinite renders, uses the value of onSaveCompleted from when the form was saved
     useEffect(() => {
         if (saveState === 'saved') {
             setTimeout(() => {
+                onSaveCompleted?.();
                 setSaveState(state => (state === 'saved' ? '' : state));
-            }, 2000);
+            }, savedDelay);
         }
-    }, [saveState]);
+    }, [saveState, savedDelay]); // eslint-disable-line react-hooks/exhaustive-deps
 
     const isValid = (errs: ErrorMessages) => Object.values(errs).filter(Boolean).length === 0;
 
@@ -67,35 +83,51 @@ const useForm = <State>({initialState, onSave, onSaveError, onValidate}: {
     );
 
     // function to save the changed settings via API
-    const handleSave = useCallback(
-        async (options: {force?: boolean} = {}) => {
-            if (!validate()) {
-                return false;
-            }
+    const handleSave = useCallback<SaveHandler>(async (options = {}) => {
+        if (!validate()) {
+            return false;
+        }
 
-            if (saveState !== 'unsaved' && !options.force) {
-                return true;
-            }
+        if (saveState !== 'unsaved' && !options.force && !options.fakeWhenUnchanged) {
+            return true;
+        }
+
+        const timeBefore = Date.now();
 
-            setSaveState('saving');
-            try {
+        setSaveState('saving');
+        try {
+            if (saveState === 'unsaved' || options.force) {
                 await onSave(formState);
-                setSaveState('saved');
-                return true;
-            } catch (e) {
-                await onSaveError?.(e);
-                setSaveState('unsaved');
-                throw e;
             }
-        },
-        [formState, saveState, onSave, onSaveError, validate]
-    );
+
+            const duration = Date.now() - timeBefore;
+            if (savingDelay && duration < savingDelay) {
+                await new Promise((resolve) => {
+                    setTimeout(resolve, savingDelay - duration);
+                });
+            }
+
+            setSaveState('saved');
+
+            return true;
+        } catch (e) {
+            await onSaveError?.(e);
+            setSaveState('unsaved');
+            throw e;
+        }
+    }, [formState, saveState, savingDelay, onSave, onSaveError, validate]);
 
     const updateForm = useCallback((updater: (state: State) => State) => {
         setFormState(updater);
         setSaveState('unsaved');
     }, []);
 
+    const okProps: OkProps = {
+        disabled: saveState === 'saving',
+        color: saveState === 'saved' ? 'green' : 'black',
+        label: saveState === 'saved' ? 'Saved' : (saveState === 'saving' ? 'Saving...' : undefined)
+    };
+
     return {
         formState,
         saveState,
@@ -112,7 +144,8 @@ const useForm = <State>({initialState, onSave, onSaveError, onValidate}: {
             setErrors(state => ({...state, [field]: ''}));
         },
         errors,
-        setErrors
+        setErrors,
+        okProps
     };
 };
 
diff --git a/apps/admin-x-settings/src/hooks/usePinturaEditor.ts b/apps/admin-x-settings/src/hooks/usePinturaEditor.ts
index 7441c499f85..75d72771757 100644
--- a/apps/admin-x-settings/src/hooks/usePinturaEditor.ts
+++ b/apps/admin-x-settings/src/hooks/usePinturaEditor.ts
@@ -6,11 +6,6 @@ import {getSettingValues} from '../api/settings';
 import {useCallback, useEffect, useRef, useState} from 'react';
 import {useGlobalData} from '../components/providers/GlobalDataProvider';
 
-interface PinturaEditorConfig {
-    jsUrl?: string;
-    cssUrl?: string;
-}
-
 interface OpenEditorParams {
     image: string;
     handleSave: (dest: File) => void;
@@ -50,29 +45,27 @@ declare global {
     }
 }
 
-export default function usePinturaEditor({
-    config
-}: {
-        config: PinturaEditorConfig;
-    }) {
+export default function usePinturaEditor() {
     const {config: globalConfig, settings} = useGlobalData() as { config: Config, settings: Setting[] };
     const [pintura] = getSettingValues<boolean>(settings, ['pintura']);
     const [scriptLoaded, setScriptLoaded] = useState<boolean>(false);
     const [cssLoaded, setCssLoaded] = useState<boolean>(false);
     const [isOpen, setIsOpen] = useState<boolean>(false);
     const allowClose = useRef<boolean>(false);
+    const [pinturaJsUrl] = getSettingValues<string>(settings, ['pintura_js_url']);
+    const [pinturaCssUrl] = getSettingValues<string>(settings, ['pintura_css_url']);
 
     let isEnabled = pintura && scriptLoaded && cssLoaded || false;
     const pinturaConfig = globalConfig?.pintura as { js?: string; css?: string };
 
     useEffect(() => {
-        const pinturaJsUrl = () => {
+        const jsPath = () => {
             if (pinturaConfig?.js) {
                 return pinturaConfig?.js;
             }
-            return config?.jsUrl || null;
+            return pinturaJsUrl || null;
         };
-        let jsUrl = pinturaJsUrl();
+        let jsUrl = jsPath();
 
         // load the script from admin root if relative
         if (!jsUrl) {
@@ -105,16 +98,16 @@ export default function usePinturaEditor({
             Sentry.captureException(e);
             // Log script loading error
         }
-    }, [config?.jsUrl, pinturaConfig?.js]);
+    }, [pinturaJsUrl, pinturaConfig?.js]);
 
     useEffect(() => {
-        const pinturaCssUrl = () => {
+        const cssPath = () => {
             if (pinturaConfig?.css) {
                 return pinturaConfig?.css;
             }
-            return config?.cssUrl;
+            return pinturaCssUrl || null;
         };
-        let cssUrl = pinturaCssUrl();
+        let cssUrl = cssPath();
         if (!cssUrl) {
             return;
         }
@@ -143,7 +136,7 @@ export default function usePinturaEditor({
             Sentry.captureException(e);
             // wire up to sentry
         }
-    }, [config?.cssUrl, pinturaConfig?.css]);
+    }, [pinturaCssUrl, pinturaConfig?.css]);
 
     const openEditor = useCallback(
         ({image, handleSave}: OpenEditorParams) => {
@@ -221,7 +214,8 @@ export default function usePinturaEditor({
                 });
 
                 editor.on('loaderror', () => {
-                    // TODO: log error message
+                    // TODO: log error message on Sentry
+                    Sentry.captureMessage('Pintura editor failed to load');
                 });
 
                 editor.on('process', (result) => {
@@ -236,6 +230,11 @@ export default function usePinturaEditor({
 
     // Only allow closing the modal if the close button was clicked
     useEffect(() => {
+        const handleEscapePress = (event: KeyboardEvent) => {
+            if (event.key === 'Escape') {
+                event.stopPropagation();
+            }
+        };
         if (!isOpen) {
             return;
         }
@@ -247,9 +246,11 @@ export default function usePinturaEditor({
         };
 
         window.addEventListener('click', handleCloseClick, {capture: true});
+        window.addEventListener('keydown', handleEscapePress, {capture: true});
 
         return () => {
             window.removeEventListener('click', handleCloseClick, {capture: true});
+            window.removeEventListener('keydown', handleEscapePress, {capture: true});
         };
     }, [isOpen]);
 
diff --git a/apps/admin-x-settings/src/hooks/useScrollSection.tsx b/apps/admin-x-settings/src/hooks/useScrollSection.tsx
index bd5b0dedf25..91fa5759db0 100644
--- a/apps/admin-x-settings/src/hooks/useScrollSection.tsx
+++ b/apps/admin-x-settings/src/hooks/useScrollSection.tsx
@@ -21,7 +21,7 @@ export const useScrollSectionContext = () => useContext(ScrollSectionContext);
 const scrollMargin = 193;
 
 const scrollToSection = (element: HTMLDivElement, doneInitialScroll: boolean) => {
-    const root = document.getElementById('admin-x-root')!;
+    const root = document.getElementById('admin-x-settings')!;
     const top = element.getBoundingClientRect().top + root.scrollTop;
 
     root.scrollTo({
diff --git a/apps/admin-x-settings/src/hooks/useSettingGroup.tsx b/apps/admin-x-settings/src/hooks/useSettingGroup.tsx
index 2e4dfc9ad10..cfcc5d80357 100644
--- a/apps/admin-x-settings/src/hooks/useSettingGroup.tsx
+++ b/apps/admin-x-settings/src/hooks/useSettingGroup.tsx
@@ -1,10 +1,9 @@
 import React, {useEffect, useRef, useState} from 'react';
-import useForm, {ErrorMessages, SaveState} from './useForm';
-import useGlobalDirtyState from './useGlobalDirtyState';
+import useForm, {ErrorMessages, OkProps, SaveHandler, SaveState} from './useForm';
 import useHandleError from '../utils/api/handleError';
 import {Setting, SettingValue, useEditSettings} from '../api/settings';
 import {SiteData} from '../api/site';
-import {showToast} from '../admin-x-ds/global/Toast';
+import {showToast, useGlobalDirtyState} from '@tryghost/admin-x-design-system';
 import {toast} from 'react-hot-toast';
 import {useGlobalData} from '../components/providers/GlobalDataProvider';
 
@@ -18,16 +17,17 @@ export interface SettingGroupHook {
     saveState: SaveState;
     siteData: SiteData | null;
     focusRef: React.RefObject<HTMLInputElement>;
-    handleSave: () => Promise<boolean>;
+    handleSave: SaveHandler;
     handleCancel: () => void;
     updateSetting: (key: string, value: SettingValue) => void;
     handleEditingChange: (newState: boolean) => void;
     validate: () => boolean;
     errors: ErrorMessages;
     clearError: (key: string) => void;
+    okProps: OkProps;
 }
 
-const useSettingGroup = ({onValidate}: {onValidate?: () => ErrorMessages} = {}): SettingGroupHook => {
+const useSettingGroup = ({savingDelay, onValidate}: {savingDelay?: number; onValidate?: () => ErrorMessages} = {}): SettingGroupHook => {
     // create a ref to focus the input field
     const focusRef = useRef<HTMLInputElement>(null);
 
@@ -37,8 +37,9 @@ const useSettingGroup = ({onValidate}: {onValidate?: () => ErrorMessages} = {}):
 
     const [isEditing, setEditing] = useState(false);
 
-    const {formState: localSettings, saveState, handleSave, updateForm, reset, validate, errors, clearError} = useForm<LocalSetting[]>({
+    const {formState: localSettings, saveState, handleSave, updateForm, setFormState, reset, validate, errors, clearError, okProps} = useForm<LocalSetting[]>({
         initialState: settings || [],
+        savingDelay,
         onSave: async () => {
             await editSettings?.(changedSettings());
         },
@@ -61,7 +62,7 @@ const useSettingGroup = ({onValidate}: {onValidate?: () => ErrorMessages} = {}):
     // reset the local state when there's a new settings API response, unless currently editing
     useEffect(() => {
         if (!isEditing || saveState === 'saving') {
-            reset();
+            setFormState(() => settings);
         }
     // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [settings]);
@@ -124,7 +125,8 @@ const useSettingGroup = ({onValidate}: {onValidate?: () => ErrorMessages} = {}):
         handleEditingChange,
         validate,
         errors,
-        clearError
+        clearError,
+        okProps
     };
 };
 
diff --git a/apps/admin-x-settings/src/main.tsx b/apps/admin-x-settings/src/main.tsx
index abc3657d807..c2638c54ce9 100644
--- a/apps/admin-x-settings/src/main.tsx
+++ b/apps/admin-x-settings/src/main.tsx
@@ -1,4 +1,5 @@
 import './styles/demo.css';
+import './styles/index.css';
 import App from './App.tsx';
 import React from 'react';
 import ReactDOM from 'react-dom/client';
diff --git a/apps/admin-x-settings/src/styles/demo.css b/apps/admin-x-settings/src/styles/demo.css
index 7b78e515c9f..8fd3a7ab6d8 100644
--- a/apps/admin-x-settings/src/styles/demo.css
+++ b/apps/admin-x-settings/src/styles/demo.css
@@ -1,50 +1,3 @@
-@import './preflight.css';
-
-@import 'tailwindcss/base';
-@import 'tailwindcss/components';
-@import 'tailwindcss/utilities';
-
-/* Defaults */
-@layer base {
-    @font-face {
-        font-family: "Inter";
-        src: url("./src/admin-x-ds/assets/fonts/Inter.ttf") format("truetype-variations");
-        font-weight: 100 900;
-    }
-
-    body {
-        @apply font-sans text-black text-base leading-normal;
-    }
-
-    h1, h2, h3, h4, h5, h6 {
-        @apply font-bold tracking-tight leading-tighter;
-    }
-
-    h1 {
-        @apply text-5xl leading-supertight;
-    }
-
-    h2 {
-        @apply text-3xl;
-    }
-
-    h3 {
-        @apply text-2xl;
-    }
-
-    h4 {
-        @apply text-xl;
-    }
-
-    h5 {
-        @apply text-lg leading-tight;
-    }
-
-    h6 {
-        @apply text-md leading-normal;
-    }
-}
-
 :root {
     font-size: 62.5%;
     line-height: 1.5;
@@ -62,4 +15,4 @@ html, body, #root {
     height: 100%;
     margin: 0;
     letter-spacing: unset;
-}
\ No newline at end of file
+}
diff --git a/apps/admin-x-settings/src/styles/index.css b/apps/admin-x-settings/src/styles/index.css
index e3a5aaa36e0..d1f1f198edf 100644
--- a/apps/admin-x-settings/src/styles/index.css
+++ b/apps/admin-x-settings/src/styles/index.css
@@ -1,97 +1 @@
-@import './preflight.css';
-
-@import 'tailwindcss/base';
-@import 'tailwindcss/components';
-@import 'tailwindcss/utilities';
-
-/* Defaults */
-@layer base {
-    @font-face {
-        font-family: "Inter";
-        src: local("Inter") format("truetype-variations");
-        font-weight: 100 900;
-    }
-
-    .admin-x-base {
-        & {
-            @apply font-sans text-black text-base leading-normal;
-        }
-
-        h1, h2, h3, h4, h5 {
-            @apply font-bold tracking-tight leading-tighter;
-        }
-
-        h1 {
-            @apply text-4xl leading-supertight;
-        }
-
-        h2 {
-            @apply text-2xl;
-        }
-
-        h3 {
-            @apply text-xl;
-        }
-
-        h4 {
-            @apply text-lg;
-        }
-
-        h5 {
-            @apply text-md leading-supertight;
-        }
-
-        h6 {
-            @apply text-md leading-normal;
-        }
-    }
-}
-
-.admin-x-base {
-    line-height: 1.5;
-    -ms-text-size-adjust: 100%;
-    -webkit-text-size-adjust: 100%;
-
-    text-rendering: optimizeLegibility;
-    -webkit-font-smoothing: antialiased;
-    -moz-osx-font-smoothing: grayscale;
-    -webkit-text-size-adjust: 100%;
-    letter-spacing: unset;
-
-    height: 100vh;
-    width: 100%;
-    overflow-x: hidden;
-    overflow-y: auto;
-}
-
-@media (max-width: 860px) {
-    .admin-x-base {
-        height: calc(100vh - 55px);
-    }
-}
-
-.admin-x-base.dark {
-    color: #FAFAFB;
-}
-
-.admin-x-base.dark .gh-loading-orb-container {
-    background-color: #000000;
-}
-
-.admin-x-base.dark .gh-loading-orb {
-    filter: invert(100%);
-}
-
-.admin-x-base .no-scrollbar::-webkit-scrollbar {
-    display: none; /* Chrome */
-}
-
-.admin-x-base .no-scrollbar {
-    -ms-overflow-style: none;  /* IE and Edge */
-    scrollbar-width: none;  /* Firefox */
-}
-
-/* Prose classes are for formatting arbitrary HTML that comes from the API */
-.gh-prose-links a {
-    color: #30CF43;
-}
\ No newline at end of file
+@import '@tryghost/admin-x-design-system/styles.css';
diff --git a/apps/admin-x-settings/src/typings.d.ts b/apps/admin-x-settings/src/typings.d.ts
index d8c213c8726..f33c952a581 100644
--- a/apps/admin-x-settings/src/typings.d.ts
+++ b/apps/admin-x-settings/src/typings.d.ts
@@ -1,6 +1,4 @@
-declare module '@tryghost/timezone-data'
 declare module '@tryghost/limit-service'
-declare module '@tryghost/color-utils'
 declare module '@tryghost/nql'
 
 declare module '*.svg' {
diff --git a/apps/admin-x-settings/src/utils/api/handleError.ts b/apps/admin-x-settings/src/utils/api/handleError.ts
index 3139e323f34..2cba1169661 100644
--- a/apps/admin-x-settings/src/utils/api/handleError.ts
+++ b/apps/admin-x-settings/src/utils/api/handleError.ts
@@ -1,7 +1,7 @@
 import * as Sentry from '@sentry/react';
 import toast from 'react-hot-toast';
 import {APIError, JSONError, ValidationError} from '../errors';
-import {showToast} from '../../admin-x-ds/global/Toast';
+import {showToast} from '@tryghost/admin-x-design-system';
 import {useCallback} from 'react';
 import {useSentryDSN} from '../../components/providers/ServiceProvider';
 
@@ -18,9 +18,9 @@ const useHandleError = () => {
      * @param options.withToast Show a toast with the error message (default: true).
      *  In general we should validate on the client side before sending the request to avoid errors,
      *  so this toast is intended as a worst-case fallback message when we don't know what else to do.
-     * 
+     *
      */
-    type HandleErrorReturnType = void | any; 
+    type HandleErrorReturnType = void | any;
     const handleError = useCallback((error: unknown, {withToast = true}: {withToast?: boolean} = {}) : HandleErrorReturnType => {
         // eslint-disable-next-line no-console
         console.error(error);
diff --git a/apps/admin-x-settings/src/utils/api/hooks.ts b/apps/admin-x-settings/src/utils/api/hooks.ts
index a5b02b8994f..082cc5cdc3c 100644
--- a/apps/admin-x-settings/src/utils/api/hooks.ts
+++ b/apps/admin-x-settings/src/utils/api/hooks.ts
@@ -4,8 +4,8 @@ import useHandleError from './handleError';
 import {APIError, MaintenanceError, ServerUnreachableError, TimeoutError} from '../errors';
 import {UseInfiniteQueryOptions, UseQueryOptions, useInfiniteQuery, useMutation, useQuery, useQueryClient} from '@tanstack/react-query';
 import {getGhostPaths} from '../helpers';
-import {useCallback, useEffect, useMemo} from 'react';
-import {usePage, usePagination} from '../../hooks/usePagination';
+import {useCallback, useEffect, useMemo, useState} from 'react';
+import {usePagination} from '@tryghost/admin-x-design-system';
 import {usePermission} from '../../hooks/usePermissions';
 import {useSentryDSN, useServices} from '../../components/providers/ServiceProvider';
 
@@ -143,7 +143,11 @@ export const apiUrl = (path: string, searchParams: Record<string, string> = {})
 
 const parameterizedPath = (path: string, params: string | string[]) => {
     const paramList = Array.isArray(params) ? params : [params];
-    return paramList.reduce((updatedPath, param) => updatedPath.replace(/:[a-z0-9]+/, encodeURIComponent(param)), path);
+    return paramList.reduce(function (updatedPath, param) {
+        updatedPath = updatedPath + param + '/';
+        updatedPath.replace(/:[a-z0-9]+/, encodeURIComponent(param));
+        return updatedPath;
+    }, path);
 };
 
 interface QueryOptions<ResponseData> {
@@ -188,7 +192,7 @@ export const createQuery = <ResponseData>(options: QueryOptions<ResponseData>) =
 };
 
 export const createPaginatedQuery = <ResponseData extends {meta?: Meta}>(options: QueryOptions<ResponseData>) => ({searchParams, ...query}: QueryHookOptions<ResponseData> = {}) => {
-    const {page, setPage} = usePage();
+    const [page, setPage] = useState(1);
     const limit = (searchParams?.limit || options.defaultSearchParams?.limit) ? parseInt(searchParams?.limit || options.defaultSearchParams?.limit || '15') : 15;
 
     const paginatedSearchParams = searchParams || options.defaultSearchParams || {};
@@ -213,7 +217,7 @@ export const createPaginatedQuery = <ResponseData extends {meta?: Meta}>(options
         setPage,
         limit,
         // Don't pass the meta data if we are fetching, because then it is probably out of date and this causes issues
-        meta: result.isFetching ? undefined : data?.meta
+        meta: result.isFetching ? undefined : data?.meta?.pagination
     });
 
     useEffect(() => {
diff --git a/apps/admin-x-settings/src/utils/currency.ts b/apps/admin-x-settings/src/utils/currency.ts
index 00ffec3a44d..be1d5da5669 100644
--- a/apps/admin-x-settings/src/utils/currency.ts
+++ b/apps/admin-x-settings/src/utils/currency.ts
@@ -1,4 +1,4 @@
-import {SelectOptionGroup} from '../admin-x-ds/global/form/Select';
+import {SelectOptionGroup} from '@tryghost/admin-x-design-system';
 
 type CurrencyOption = {
     isoCode: string;
diff --git a/apps/admin-x-settings/src/utils/getOffersPortalPreviewUrl.ts b/apps/admin-x-settings/src/utils/getOffersPortalPreviewUrl.ts
new file mode 100644
index 00000000000..c85e0e2230b
--- /dev/null
+++ b/apps/admin-x-settings/src/utils/getOffersPortalPreviewUrl.ts
@@ -0,0 +1,55 @@
+export type offerPortalPreviewUrlTypes = {
+    disableBackground?: boolean;
+    name: string;
+    code: string;
+    displayTitle?: string;
+    displayDescription?: string;
+    type: string;
+    cadence: string;
+    amount?: number;
+    duration: string;
+    durationInMonths: number;
+    currency?: string;
+    status: string;
+    tierId: string;
+};
+
+export const getOfferPortalPreviewUrl = (overrides:offerPortalPreviewUrlTypes, baseUrl: string) : string => {
+    const {
+        disableBackground = false,
+        name,
+        code,
+        displayTitle = '',
+        displayDescription = '',
+        type,
+        cadence,
+        amount = 0,
+        duration,
+        durationInMonths,
+        currency = 'usd',
+        status,
+        tierId
+    } = overrides;
+
+    const portalBase = '/#/portal/preview/offer';
+    const settingsParam = new URLSearchParams();
+
+    settingsParam.append('name', encodeURIComponent(name));
+    settingsParam.append('code', encodeURIComponent(code));
+    settingsParam.append('display_title', encodeURIComponent(displayTitle));
+    settingsParam.append('display_description', encodeURIComponent(displayDescription));
+    settingsParam.append('type', encodeURIComponent(type));
+    settingsParam.append('cadence', encodeURIComponent(cadence));
+    settingsParam.append('amount', encodeURIComponent(amount));
+    settingsParam.append('duration', encodeURIComponent(duration));
+    settingsParam.append('duration_in_months', encodeURIComponent(durationInMonths));
+    settingsParam.append('currency', encodeURIComponent(currency));
+    settingsParam.append('status', encodeURIComponent(status));
+    settingsParam.append('tier_id', encodeURIComponent(tierId));
+
+    if (disableBackground) {
+        settingsParam.append('disableBackground', 'true');
+    }
+
+    return `${baseUrl}${portalBase}?${settingsParam.toString()}`;
+};
diff --git a/apps/admin-x-settings/src/utils/getPortalPreviewUrl.ts b/apps/admin-x-settings/src/utils/getPortalPreviewUrl.ts
new file mode 100644
index 00000000000..672690420ad
--- /dev/null
+++ b/apps/admin-x-settings/src/utils/getPortalPreviewUrl.ts
@@ -0,0 +1,61 @@
+import {Config} from '../api/config';
+import {Setting, checkStripeEnabled, getSettingValue} from '../api/settings';
+import {SiteData} from '../api/site';
+import {Tier} from '../api/tiers';
+
+export type portalPreviewUrlTypes = {
+    settings: Setting[];
+    config: Config;
+    tiers: Tier[];
+    siteData: SiteData | null;
+    selectedTab: string;
+};
+
+export const getPortalPreviewUrl = ({settings, config, tiers, siteData, selectedTab} : portalPreviewUrlTypes): string | null => {
+    if (!siteData?.url) {
+        return null;
+    }
+    let portalTiers = tiers.filter((t) => {
+        return t.visibility === 'public' && t.type === 'paid';
+    }).map(t => t.id);
+
+    const baseUrl = siteData.url.replace(/\/$/, '');
+    const portalBase = '/?v=modal-portal-settings#/portal/preview';
+
+    const portalPlans: string[] = JSON.parse(getSettingValue<string>(settings, 'portal_plans') || '');
+    const membersSignupAccess = getSettingValue<string>(settings, 'members_signup_access');
+    const allowSelfSignup = membersSignupAccess === 'all' && (!checkStripeEnabled(settings, config) || portalPlans.includes('free'));
+
+    const settingsParam = new URLSearchParams();
+    settingsParam.append('button', getSettingValue(settings, 'portal_button') ? 'true' : 'false');
+    settingsParam.append('name', getSettingValue(settings, 'portal_name') ? 'true' : 'false');
+    settingsParam.append('isFree', portalPlans.includes('free') ? 'true' : 'false');
+    settingsParam.append('isMonthly', checkStripeEnabled(settings, config) && portalPlans.includes('monthly') ? 'true' : 'false');
+    settingsParam.append('isYearly', checkStripeEnabled(settings, config) && portalPlans.includes('yearly') ? 'true' : 'false');
+    settingsParam.append('page', selectedTab === 'account' ? 'accountHome' : 'signup');
+    settingsParam.append('buttonIcon', encodeURIComponent(getSettingValue(settings, 'portal_button_icon') || 'icon-1'));
+    settingsParam.append('signupButtonText', encodeURIComponent(getSettingValue(settings, 'portal_button_signup_text') || ''));
+    settingsParam.append('membersSignupAccess', getSettingValue(settings, 'members_signup_access') || 'all');
+    settingsParam.append('allowSelfSignup', allowSelfSignup ? 'true' : 'false');
+    settingsParam.append('signupTermsHtml', getSettingValue(settings, 'portal_signup_terms_html') || '');
+    settingsParam.append('signupCheckboxRequired', getSettingValue(settings, 'portal_signup_checkbox_required') ? 'true' : 'false');
+    settingsParam.append('portalProducts', encodeURIComponent(portalTiers.join(','))); // assuming that it might be more than 1
+
+    if (portalPlans && portalPlans.length) {
+        settingsParam.append('portalPrices', encodeURIComponent(portalPlans.join(',')));
+    }
+
+    const accentColor = getSettingValue(settings, 'accent_color');
+    if (accentColor !== undefined && accentColor !== null) {
+        settingsParam.append('accentColor', encodeURIComponent(accentColor));
+    }
+
+    const portalButtonStyle = getSettingValue(settings, 'portal_button_style');
+    if (portalButtonStyle) {
+        settingsParam.append('buttonStyle', encodeURIComponent(portalButtonStyle));
+    }
+
+    settingsParam.append('disableBackground', 'false');
+
+    return `${baseUrl}${portalBase}?${settingsParam.toString()}`;
+};
diff --git a/apps/admin-x-settings/tailwind.config.cjs b/apps/admin-x-settings/tailwind.config.cjs
index b2a527a5ef0..cbb337ca9eb 100644
--- a/apps/admin-x-settings/tailwind.config.cjs
+++ b/apps/admin-x-settings/tailwind.config.cjs
@@ -1,295 +1,6 @@
-/** @type {import('tailwindcss').Config} */
+const adminXPreset = require('@tryghost/admin-x-design-system/tailwind.cjs');
+
 module.exports = {
-    corePlugins: {
-        preflight: false // we're providing our own scoped CSS reset
-    },
-    darkMode: 'class',
-    important: '.admin-x-settings',
-    content: ['./index.html', './src/**/*.{js,ts,jsx,tsx}'],
-    theme: {
-        screens: {
-            sm: '480px',
-            md: '640px',
-            lg: '1024px',
-            xl: '1280px',
-            tablet: '860px'
-        },
-        colors: {
-            transparent: 'transparent',
-            current: 'currentColor',
-            white: '#FFF',
-            black: '#15171A',
-            grey: {
-                DEFAULT: '#ABB4BE',
-                50: '#FAFAFB',
-                75: '#F9FAFB',
-                100: '#F4F5F6',
-                150: '#F1F3F4',
-                200: '#EBEEF0',
-                300: '#DDE1E5',
-                400: '#CED4D9',
-                500: '#AEB7C1',
-                600: '#95A1AD',
-                700: '#7C8B9A',
-                800: '#626D79',
-                900: '#394047',
-                925: '#2E3338',
-                950: '#222427'
-            },
-            green: {
-                DEFAULT: '#30CF43',
-                100: '#E1F9E4',
-                400: '#58DA67',
-                500: '#30CF43',
-                600: '#2AB23A'
-            },
-            blue: {
-                DEFAULT: '#14B8FF',
-                100: '#DBF4FF',
-                400: '#42C6FF',
-                500: '#14B8FF',
-                600: '#00A4EB'
-            },
-            purple: {
-                DEFAULT: '#8E42FF',
-                100: '#EDE0FF',
-                400: '#A366FF',
-                500: '#8E42FF',
-                600: '7B1FFF'
-            },
-            pink: {
-                DEFAULT: '#FB2D8D',
-                100: '#FFDFEE',
-                400: '#FF5CA8',
-                500: '#FB2D8D',
-                600: '#F70878'
-            },
-            red: {
-                DEFAULT: '#F50B23',
-                100: '#FFE0E0',
-                400: '#F9394C',
-                500: '#F50B23',
-                600: '#DC091E'
-            },
-            yellow: {
-                DEFAULT: '#FFB41F',
-                100: '#FFF1D6',
-                400: '#FFC247',
-                500: '#FFB41F',
-                600: '#F0A000'
-            },
-            lime: {
-                DEFAULT: '#B5FF18'
-            }
-        },
-        fontFamily: {
-            inter: 'Inter',
-            sans: 'Inter, -apple-system, BlinkMacSystemFont, avenir next, avenir, helvetica neue, helvetica, ubuntu, roboto, noto, segoe ui, arial, sans-serif',
-            serif: 'Georgia, serif',
-            mono: 'Consolas, Liberation Mono, Menlo, Courier, monospace',
-            inherit: 'inherit'
-        },
-        boxShadow: {
-            DEFAULT: '0 0 1px rgba(0,0,0,.05), 0 5px 18px rgba(0,0,0,.08)',
-            sm: '0 0 1px rgba(0,0,0,.12), 0 1px 6px rgba(0,0,0,0.03), 0 6px 10px -8px rgba(0,0,0,.1)',
-            md: '0 0 1px rgba(0,0,0,.05), 0 8px 28px rgba(0,0,0,.12)',
-            lg: '0 0 7px rgba(0, 0, 0, 0.08), 0 2.1px 2.2px -5px rgba(0, 0, 0, 0.011), 0 5.1px 5.3px -5px rgba(0, 0, 0, 0.016), 0 9.5px 10px -5px rgba(0, 0, 0, 0.02), 0 17px 17.9px -5px rgba(0, 0, 0, 0.024), 0 31.8px 33.4px -5px rgba(0, 0, 0, 0.029), 0 76px 80px -5px rgba(0, 0, 0, 0.04)',
-            xl: '0 2.8px 2.2px rgba(0, 0, 0, 0.02), 0 6.7px 5.3px rgba(0, 0, 0, 0.028), 0 12.5px 10px rgba(0, 0, 0, 0.035), 0 22.3px 17.9px rgba(0, 0, 0, 0.042), 0 41.8px 33.4px rgba(0, 0, 0, 0.05), 0 100px 80px rgba(0, 0, 0, 0.07)',
-            inner: 'inset 0 0 4px 0 rgb(0 0 0 / 0.08)',
-            none: '0 0 #0000'
-        },
-        extend: {
-            keyframes: {
-                toasterIn: {
-                    '0.00%': {
-                        opacity: '0',
-                        transform: 'translateX(-232.05px)'
-                    },
-                    '26.52%': {
-                        opacity: '0.5',
-                        transform: 'translateX(5.90px)'
-                    },
-                    '63.26%': {
-                        opacity: '1',
-                        transform: 'translateX(-1.77px)'
-                    },
-                    '100.00%': {
-                        transform: 'translateX(0px)'
-                    }
-                },
-                toasterTopIn: {
-                    '0.00%': {
-                        opacity: '0',
-                        transform: 'translateY(-82px)'
-                    },
-                    '26.52%': {
-                        opacity: '0.5',
-                        transform: 'translateY(5.90px)'
-                    },
-                    '63.26%': {
-                        opacity: '1',
-                        transform: 'translateY(-1.77px)'
-                    },
-                    '100.00%': {
-                        transform: 'translateY(0px)'
-                    }
-                },
-                toasterOut: {
-                    '0%': {
-                        opacity: '1'
-                    },
-                    '100%': {
-                        opacity: '0'
-                    }
-                },
-                fadeIn: {
-                    '0%': {
-                        opacity: '0'
-                    },
-                    '100%': {
-                        opacity: '1'
-                    }
-                },
-                fadeOut: {
-                    '0%': {
-                        opacity: '1'
-                    },
-                    '100%': {
-                        opacity: '0'
-                    }
-                },
-                modalIn: {
-                    '0%': {
-                        transform: 'translateY(32px)'
-                    },
-                    '100%': {
-                        transform: 'translateY(0px)'
-                    }
-                },
-                modalInReverse: {
-                    '0%': {
-                        transform: 'translateY(-32px)'
-                    },
-                    '100%': {
-                        transform: 'translateY(0px)'
-                    }
-                },
-                spin: {
-                    '0%': {
-                        transform: 'rotate(0deg)'
-                    },
-                    '100%': {
-                        transform: 'rotate(360deg)'
-                    }
-                }
-            },
-            animation: {
-                'toaster-in': 'toasterIn 0.8s cubic-bezier(0.445, 0.050, 0.550, 0.950)',
-                'toaster-out': 'toasterOut 0.4s 0s 1 ease forwards',
-                'toaster-top-in': 'toasterTopIn 0.8s cubic-bezier(0.445, 0.050, 0.550, 0.950)',
-                'fade-in': 'fadeIn 0.15s ease forwards',
-                'fade-out': 'fadeOut 0.15s ease forwards',
-                'setting-highlight-fade-out': 'fadeOut 0.2s 1.4s ease forwards',
-                'modal-backdrop-in': 'fadeIn 0.15s ease forwards',
-                'modal-in': 'modalIn 0.25s ease forwards',
-                'modal-in-reverse': 'modalInReverse 0.25s ease forwards',
-                spin: 'spin 1s linear infinite'
-            },
-            spacing: {
-                px: '1px',
-                0: '0px',
-                0.5: '0.2rem',
-                1: '0.4rem',
-                1.5: '0.6rem',
-                2: '0.8rem',
-                2.5: '1rem',
-                3: '1.2rem',
-                3.5: '1.4rem',
-                4: '1.6rem',
-                5: '2rem',
-                6: '2.4rem',
-                7: '2.8rem',
-                8: '3.2rem',
-                9: '3.6rem',
-                10: '4rem',
-                11: '4.4rem',
-                12: '4.8rem',
-                14: '5.6rem',
-                16: '6.4rem',
-                18: '7.2rem',
-                20: '8rem',
-                24: '9.6rem',
-                28: '11.2rem',
-                32: '12.8rem',
-                36: '14.4rem',
-                40: '16rem',
-                44: '17.6rem',
-                48: '19.2rem',
-                52: '20.8rem',
-                56: '22.4rem',
-                60: '24rem',
-                64: '25.6rem',
-                72: '28.8rem',
-                80: '32rem',
-                96: '38.4rem'
-            },
-            maxWidth: {
-                none: 'none',
-                0: '0rem',
-                xs: '32rem',
-                sm: '38.4rem',
-                md: '44.8rem',
-                lg: '51.2rem',
-                xl: '57.6rem',
-                '2xl': '67.2rem',
-                '3xl': '76.8rem',
-                '4xl': '89.6rem',
-                '5xl': '102.4rem',
-                '6xl': '115.2rem',
-                '7xl': '128rem',
-                '8xl': '140rem',
-                '9xl': '156rem',
-                full: '100%',
-                min: 'min-content',
-                max: 'max-content',
-                fit: 'fit-content',
-                prose: '65ch'
-            },
-            borderRadius: {
-                sm: '0.3rem',
-                DEFAULT: '0.4rem',
-                md: '0.6rem',
-                lg: '0.8rem',
-                xl: '1.2rem',
-                '2xl': '1.6rem',
-                '3xl': '2.4rem',
-                full: '9999px'
-            },
-            fontSize: {
-                '2xs': '1.0rem',
-                base: '1.45rem',
-                xs: '1.2rem',
-                sm: '1.35rem',
-                md: '1.45rem',
-                lg: '1.75rem',
-                xl: '2rem',
-                '2xl': '2.4rem',
-                '3xl': '3rem',
-                '4xl': '3.6rem',
-                '5xl': ['4.2rem', '1.15'],
-                '6xl': ['6rem', '1'],
-                '7xl': ['7.2rem', '1'],
-                '8xl': ['9.6rem', '1'],
-                '9xl': ['12.8rem', '1'],
-                inherit: 'inherit'
-            },
-            lineHeight: {
-                base: '1.5em',
-                tight: '1.35em',
-                tighter: '1.25em',
-                supertight: '1.1em'
-            }
-        }
-    }
-    // plugins: [require('@tailwindcss/forms')],
+    presets: [adminXPreset('.admin-x-settings')],
+    content: ['./index.html', './src/**/*.{js,ts,jsx,tsx}', '../../node_modules/@tryghost/admin-x-design-system/es/**/*.{js,ts,jsx,tsx}']
 };
diff --git a/apps/admin-x-settings/test/acceptance/membership/offers.test.ts b/apps/admin-x-settings/test/acceptance/membership/offers.test.ts
new file mode 100644
index 00000000000..bb14e70c8d7
--- /dev/null
+++ b/apps/admin-x-settings/test/acceptance/membership/offers.test.ts
@@ -0,0 +1,100 @@
+import {expect, test} from '@playwright/test';
+import {globalDataRequests, mockApi, responseFixtures, settingsWithStripe, toggleLabsFlag} from '../../utils/acceptance';
+
+test.describe('Offers Modal', () => {
+    test.beforeEach(async () => {
+        toggleLabsFlag('adminXOffers', true);
+    });
+
+    test('Offers Modal is available', async ({page}) => {
+        await mockApi({page, requests: {
+            ...globalDataRequests,
+            browseSettings: {...globalDataRequests.browseSettings, response: settingsWithStripe}
+        }});
+        await page.goto('/');
+        const section = page.getByTestId('offers');
+        await section.getByRole('button', {name: 'Manage offers'}).click();
+        const modal = page.getByTestId('offers-modal');
+        await expect(modal).toBeVisible();
+    });
+
+    test('Can view active offers', async ({page}) => {
+        await mockApi({page, requests: {
+            ...globalDataRequests,
+            browseSettings: {...globalDataRequests.browseSettings, response: settingsWithStripe},
+            browseOffers: {method: 'GET', path: '/offers/?limit=all', response: responseFixtures.offers},
+            browseTiers: {method: 'GET', path: '/tiers/', response: responseFixtures.tiers}
+        }});
+
+        await page.goto('/');
+        const section = page.getByTestId('offers');
+        await section.getByRole('button', {name: 'Manage offers'}).click();
+        const modal = page.getByTestId('offers-modal');
+        await expect(modal).toContainText('Active offers');
+        await expect(modal).toContainText('First offer');
+        await expect(modal).toContainText('Second offer'); 
+    });
+
+    test('Can view archived offers', async ({page}) => {
+        await mockApi({page, requests: {
+            ...globalDataRequests,
+            browseSettings: {...globalDataRequests.browseSettings, response: settingsWithStripe},
+            browseOffers: {method: 'GET', path: '/offers/?limit=all', response: responseFixtures.offers},
+            browseTiers: {method: 'GET', path: '/tiers/', response: responseFixtures.tiers}
+        }});
+
+        await page.goto('/');
+        const section = page.getByTestId('offers');
+        await section.getByRole('button', {name: 'Manage offers'}).click();
+        const modal = page.getByTestId('offers-modal');
+        await modal.getByText('Archived').click();
+        await expect(modal).toContainText('Archived offers');
+        await expect(modal).toContainText('Third offer'); 
+    });
+
+    test('Supports updating an offer', async ({page}) => {
+        const {lastApiRequests} = await mockApi({page, requests: {
+            ...globalDataRequests,
+            browseSettings: {...globalDataRequests.browseSettings, response: settingsWithStripe},
+            browseOffers: {method: 'GET', path: '/offers/?limit=all', response: responseFixtures.offers},
+            browseOffersById: {method: 'GET', path: `/offers/${responseFixtures.offers.offers[0].id}/`, response: responseFixtures.offers},
+            browseTiers: {method: 'GET', path: '/tiers/', response: responseFixtures.tiers},
+            editOffer: {method: 'PUT', path: `/offers/${responseFixtures.offers.offers[0].id}/`, response: {
+                offers: [{
+                    id: responseFixtures.offers.offers[0].id,
+                    name: 'Updated offer',
+                    body_font_category: 'sans_serif'
+                }]
+            }}
+        }});
+
+        await page.goto('/');
+        const section = page.getByTestId('offers');
+        await section.getByRole('button', {name: 'Manage offers'}).click();
+        const modal = page.getByTestId('offers-modal');
+        await expect(modal).toContainText('Active offers');
+        await expect(modal).toContainText('First offer'); 
+        await modal.getByText('First offer').click();
+
+        const offerUpdateModal = page.getByTestId('offer-update-modal');
+        await expect(offerUpdateModal).toBeVisible();
+
+        await offerUpdateModal.getByPlaceholder('black-friday').fill('');
+        await offerUpdateModal.getByRole('button', {name: 'Save'}).click();
+
+        await expect(page.getByTestId('toast-error')).toContainText(/Can't save offer, please double check that you've filled all mandatory fields./);
+        await expect(offerUpdateModal).toContainText(/Please enter a code/);
+
+        await offerUpdateModal.getByPlaceholder('black-friday').fill('black-friday-offer');
+
+        await offerUpdateModal.getByRole('button', {name: 'Save'}).click();
+
+        expect(lastApiRequests.editOffer?.body).toMatchObject({
+            offers: [{
+                id: responseFixtures.offers.offers[0].id,
+                name: 'First offer',
+                code: 'black-friday-offer'
+            }]
+        });
+    });
+});
diff --git a/apps/admin-x-settings/test/acceptance/membership/recommendations.test.ts b/apps/admin-x-settings/test/acceptance/membership/recommendations.test.ts
index 60b463c4986..8696270ab64 100644
--- a/apps/admin-x-settings/test/acceptance/membership/recommendations.test.ts
+++ b/apps/admin-x-settings/test/acceptance/membership/recommendations.test.ts
@@ -29,7 +29,7 @@ test.describe('Recommendations', async () => {
     test('can add a recommendation', async ({page}) => {
         const {lastApiRequests} = await mockApi({page, requests: {
             ...globalDataRequests,
-            getRecommendationByUrl: {method: 'GET', path: '/recommendations/?filter=url%3A%7E%27example.com%2Fa-cool-website%27', response: {recommendations: [], meta: {}}},
+            checkRecommendation: {method: 'POST', path: '/recommendations/check/', response: {recommendations: [{url: '', one_click_subscribe: true}], meta: {}}},
             addRecommendation: {method: 'POST', path: '/recommendations/', response: {}}
         }});
 
@@ -74,7 +74,7 @@ test.describe('Recommendations', async () => {
                 {excerpt: null,
                     favicon: null,
                     featured_image: null,
-                    one_click_subscribe: false,
+                    one_click_subscribe: true,
                     description: 'This is a description',
                     title: 'This is a title',
                     url: 'https://example.com/a-cool-website'}
@@ -85,7 +85,7 @@ test.describe('Recommendations', async () => {
     test('errors when adding an existing URL', async ({page}) => {
         await mockApi({page, requests: {
             ...globalDataRequests,
-            getRecommendationByUrl: {method: 'GET', path: '/recommendations/?filter=url%3A%7E%27recommendation1.com%27', response: responseFixtures.recommendations}
+            checkRecommendation: {method: 'POST', path: '/recommendations/check/', response: {recommendations: [{url: 'https://recommendation1.com', one_click_subscribe: true, id: 'exists'}], meta: {}}}
         }});
 
         await page.goto('/');
diff --git a/apps/admin-x-settings/test/acceptance/membership/tiers.test.ts b/apps/admin-x-settings/test/acceptance/membership/tiers.test.ts
index 52f8a98d3d3..69fc65bcac8 100644
--- a/apps/admin-x-settings/test/acceptance/membership/tiers.test.ts
+++ b/apps/admin-x-settings/test/acceptance/membership/tiers.test.ts
@@ -1,12 +1,5 @@
 import {expect, test} from '@playwright/test';
-import {globalDataRequests, mockApi, responseFixtures, updatedSettingsResponse} from '../../utils/acceptance';
-
-const settingsWithStripe = updatedSettingsResponse([
-    {key: 'stripe_connect_publishable_key', value: 'pk_test_123'},
-    {key: 'stripe_connect_secret_key', value: 'sk_test_123'},
-    {key: 'stripe_connect_display_name', value: 'Dummy'},
-    {key: 'stripe_connect_account_id', value: 'acct_123'}
-]);
+import {globalDataRequests, mockApi, responseFixtures, settingsWithStripe} from '../../utils/acceptance';
 
 test.describe('Tier settings', async () => {
     test('Supports creating a new tier', async ({page}) => {
diff --git a/apps/admin-x-settings/test/utils/acceptance.ts b/apps/admin-x-settings/test/utils/acceptance.ts
index 42041a2059f..7e3b1301dae 100644
--- a/apps/admin-x-settings/test/utils/acceptance.ts
+++ b/apps/admin-x-settings/test/utils/acceptance.ts
@@ -57,7 +57,8 @@ let defaultLabFlags = {
     outboundLinkTagging: false,
     announcementBar: false,
     signupForm: false,
-    members: false
+    members: false,
+    adminXOffers: false
 };
 
 // Inject defaultLabFlags into responseFixtures.settings and config
@@ -122,6 +123,13 @@ export const globalDataRequests = {
     browseMe: {method: 'GET', path: '/users/me/?include=roles', response: responseFixtures.me}
 };
 
+export const settingsWithStripe = updatedSettingsResponse([
+    {key: 'stripe_connect_publishable_key', value: 'pk_test_123'},
+    {key: 'stripe_connect_secret_key', value: 'sk_test_123'},
+    {key: 'stripe_connect_display_name', value: 'Dummy'},
+    {key: 'stripe_connect_account_id', value: 'acct_123'}
+]);
+
 export const limitRequests = {
     browseUsers: {method: 'GET', path: '/users/?limit=100&include=roles', response: responseFixtures.users},
     browseInvites: {method: 'GET', path: '/invites/', response: responseFixtures.invites},
diff --git a/apps/admin-x-settings/test/utils/responses/offers.json b/apps/admin-x-settings/test/utils/responses/offers.json
index 0974e8027c7..b6194c9f435 100644
--- a/apps/admin-x-settings/test/utils/responses/offers.json
+++ b/apps/admin-x-settings/test/utils/responses/offers.json
@@ -39,6 +39,26 @@
                 "id": "645453f4d254799990dd0e22",
                 "name": "Supporter"
             }
+        },
+        {
+            "id": "6487f0c364fca78ec2fff600",
+            "name": "Third offer",
+            "code": "third-offer",
+            "display_title": "Third offer",
+            "display_description": "",
+            "type": "percent",
+            "cadence": "month",
+            "amount": 12,
+            "duration": "repeating",
+            "duration_in_months": 3,
+            "currency_restriction": false,
+            "currency": null,
+            "status": "archived",
+            "redemption_count": 0,
+            "tier": {
+                "id": "645453f4d254799990dd0e22",
+                "name": "Supporter"
+            }
         }
     ]
 }
diff --git a/apps/announcement-bar/package.json b/apps/announcement-bar/package.json
index 417d292974f..9c790b54a72 100644
--- a/apps/announcement-bar/package.json
+++ b/apps/announcement-bar/package.json
@@ -17,7 +17,7 @@
     "registry": "https://registry.npmjs.org/"
   },
   "dependencies": {
-    "@tryghost/content-api": "1.11.7",
+    "@tryghost/content-api": "1.11.19",
     "react": "17.0.2",
     "react-dom": "17.0.2"
   },
@@ -79,7 +79,7 @@
     ]
   },
   "devDependencies": {
-    "@vitejs/plugin-react": "4.1.0",
+    "@vitejs/plugin-react": "4.1.1",
     "vite": "4.5.0",
     "vite-plugin-svgr": "3.3.0",
     "vitest": "0.34.3"
diff --git a/apps/comments-ui/package.json b/apps/comments-ui/package.json
index f2d19015cab..e046ae941e5 100644
--- a/apps/comments-ui/package.json
+++ b/apps/comments-ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tryghost/comments-ui",
-  "version": "0.13.2",
+  "version": "0.13.3",
   "license": "MIT",
   "repository": "git@github.com:TryGhost/comments-ui.git",
   "author": "Ghost Foundation",
@@ -64,7 +64,7 @@
     "@testing-library/react": "12.1.5",
     "@testing-library/user-event": "14.4.3",
     "@tryghost/i18n": "0.0.0",
-    "@vitejs/plugin-react": "4.1.0",
+    "@vitejs/plugin-react": "4.1.1",
     "@vitest/coverage-v8": "0.34.3",
     "autoprefixer": "10.4.16",
     "bson-objectid": "2.0.4",
diff --git a/apps/comments-ui/src/components/content/Comment.tsx b/apps/comments-ui/src/components/content/Comment.tsx
index 405931fb728..efd01664ad2 100644
--- a/apps/comments-ui/src/components/content/Comment.tsx
+++ b/apps/comments-ui/src/components/content/Comment.tsx
@@ -140,7 +140,7 @@ const MemberExpertise: React.FC<{comment: Comment}> = ({comment}) => {
     }
 
     return (
-        <span>{memberExpertise}<span className="mx-[0.3em]">·</span></span>
+        <span className="[overflow-wrap:anywhere]">{memberExpertise}<span className="mx-[0.3em]">·</span></span>
     );
 };
 
@@ -225,7 +225,7 @@ const CommentBody: React.FC<{html: string}> = ({html}) => {
     const dangerouslySetInnerHTML = {__html: html};
     return (
         <div className="mt mb-2 flex flex-row items-center gap-4 pr-4">
-            <p dangerouslySetInnerHTML={dangerouslySetInnerHTML} className="gh-comment-content font-sans text-[16px] leading-normal text-neutral-900 dark:text-[rgba(255,255,255,0.85)]" data-testid="comment-content"/>
+            <p dangerouslySetInnerHTML={dangerouslySetInnerHTML} className="gh-comment-content font-sans text-[16px] leading-normal text-neutral-900 [overflow-wrap:anywhere] dark:text-[rgba(255,255,255,0.85)]" data-testid="comment-content"/>
         </div>
     );
 };
diff --git a/apps/portal/package.json b/apps/portal/package.json
index 993441c1bc0..3ea7bab36a6 100644
--- a/apps/portal/package.json
+++ b/apps/portal/package.json
@@ -80,12 +80,12 @@
   "devDependencies": {
     "@babel/eslint-parser": "7.22.15",
     "@doist/react-interpolate": "0.4.1",
-    "@sentry/react": "7.70.0",
-    "@sentry/tracing": "7.70.0",
+    "@sentry/react": "7.78.0",
+    "@sentry/tracing": "7.78.0",
     "@testing-library/jest-dom": "5.17.0",
     "@testing-library/react": "12.1.5",
     "@tryghost/i18n": "0.0.0",
-    "@vitejs/plugin-react": "4.1.0",
+    "@vitejs/plugin-react": "4.1.1",
     "@vitest/coverage-v8": "0.34.3",
     "@vitest/ui": "0.34.3",
     "concurrently": "8.2.2",
diff --git a/apps/portal/src/components/pages/SignupPage.js b/apps/portal/src/components/pages/SignupPage.js
index ff88e8d5e90..d48fd74c2ef 100644
--- a/apps/portal/src/components/pages/SignupPage.js
+++ b/apps/portal/src/components/pages/SignupPage.js
@@ -287,6 +287,10 @@ footer.gh-portal-signup-footer.invite-only .gh-portal-signup-message {
     line-height: 1.5em;
 }
 
+.gh-portal-signup-terms-content p {
+    margin-bottom: 0;
+}
+
 .gh-portal-error .gh-portal-signup-terms-content {
     line-height: 1.5em;
 }
diff --git a/apps/portal/src/components/pages/UnsubscribePage.js b/apps/portal/src/components/pages/UnsubscribePage.js
index 0154c6c59e0..0c66a51b371 100644
--- a/apps/portal/src/components/pages/UnsubscribePage.js
+++ b/apps/portal/src/components/pages/UnsubscribePage.js
@@ -8,6 +8,7 @@ import CloseButton from '../common/CloseButton';
 import {ReactComponent as WarningIcon} from '../../images/icons/warning-fill.svg';
 import Interpolate from '@doist/react-interpolate';
 import {SYNTAX_I18NEXT} from '@doist/react-interpolate';
+import LoadingPage from './LoadingPage';
 
 function SiteLogo() {
     const {site} = useContext(AppContext);
@@ -44,6 +45,7 @@ export default function UnsubscribePage() {
     const {site, pageData, onAction, t} = useContext(AppContext);
     const api = setupGhostApi({siteUrl: site.url});
     const [member, setMember] = useState();
+    const [loading, setLoading] = useState(true);
     const siteNewsletters = getSiteNewsletters({site});
     const defaultNewsletters = siteNewsletters.filter((d) => {
         return d.subscribe_on_signup;
@@ -57,12 +59,26 @@ export default function UnsubscribePage() {
     useEffect(() => {
         const ghostApi = setupGhostApi({siteUrl: site.url});
         (async () => {
-            const memberData = await ghostApi.member.newsletters({uuid: pageData.uuid});
+            let memberData;
+            try {
+                memberData = await ghostApi.member.newsletters({uuid: pageData.uuid});
+                setMember(memberData ?? null);
+                setLoading(false);
+            } catch (e) {
+                // eslint-disable-next-line no-console
+                console.error('[PORTAL] Error fetching member newsletters', e);
+                setMember(null);
+                setLoading(false);
+                return;
+            }
+
+            if (memberData === null) {
+                return;
+            }
 
-            setMember(memberData);
             const memberNewsletters = memberData?.newsletters || [];
             setSubscribedNewsletters(memberNewsletters);
-            if (siteNewsletters?.length === 1 && !commentsEnabled) {
+            if (siteNewsletters?.length === 1 && !commentsEnabled && !pageData.newsletterUuid) {
                 // Unsubscribe from all the newsletters, because we only have one
                 const updatedData = await updateMemberNewsletters({
                     api: ghostApi,
@@ -93,8 +109,15 @@ export default function UnsubscribePage() {
         })();
     }, [commentsEnabled, pageData.uuid, pageData.newsletterUuid, pageData.comments, site.url, siteNewsletters?.length]);
 
-    // Case: Email not found
-    if (member === null) {
+    if (loading) {
+        // Loading member data from the API based on the uuid
+        return (
+            <LoadingPage />
+        );
+    }
+
+    // Case: invalid uuid passed
+    if (!member) {
         return (
             <div className='gh-portal-content gh-portal-feedback with-footer'>
                 <CloseButton />
@@ -176,6 +199,11 @@ export default function UnsubscribePage() {
         const unsubscribedNewsletter = siteNewsletters?.find((d) => {
             return d.uuid === pageData.newsletterUuid;
         });
+
+        if (!unsubscribedNewsletter) {
+            return null;
+        }
+
         const hideClassName = hasInteracted ? 'gh-portal-hide' : '';
         return (
             <>
diff --git a/apps/signup-form/README.md b/apps/signup-form/README.md
index 26c27a5f515..403ea0fc869 100644
--- a/apps/signup-form/README.md
+++ b/apps/signup-form/README.md
@@ -23,7 +23,7 @@ Run `yarn dev` (in package folder) to start the development server to test/devel
 
 ### Using the UMD build during development
 
-Vite by default only supports HRM with an ESM output. But when loading a script on a site as a ESM module (`<script type="module" src="...">`), you don't have access to `document.currentScript` inside the script, which is required to determine the location to inject the iframe. In development mode we use a workaround for this to make the ESM HMR work. But this workaroudn is not suitable for production.
+Vite by default only supports HRM with an ESM output. But when loading a script on a site as a ESM module (`<script type="module" src="...">`), you don't have access to `document.currentScript` inside the script, which is required to determine the location to inject the iframe. In development mode we use a workaround for this to make the ESM HMR work. But this workaround is not suitable for production.
 
 To test the real production behaviour without this hack, you can use http://localhost:6173/preview.html. This HTML page will use `http://localhost:6174/signup-form.min.js` directly. 
 
diff --git a/apps/signup-form/package.json b/apps/signup-form/package.json
index e7626c7cfd8..c4ce0093c44 100644
--- a/apps/signup-form/package.json
+++ b/apps/signup-form/package.json
@@ -49,9 +49,9 @@
         "@storybook/react-vite": "7.4.0",
         "@storybook/testing-library": "0.2.2",
         "@tailwindcss/line-clamp": "0.4.4",
-        "@types/react": "18.2.28",
-        "@types/react-dom": "18.2.13",
-        "@vitejs/plugin-react": "4.1.0",
+        "@types/react": "18.2.37",
+        "@types/react-dom": "18.2.15",
+        "@vitejs/plugin-react": "4.1.1",
         "autoprefixer": "10.4.16",
         "concurrently": "8.2.2",
         "eslint-plugin-react-hooks": "4.6.0",
diff --git a/apps/sodo-search/package.json b/apps/sodo-search/package.json
index 6a91e1ae20e..6593e26dd70 100644
--- a/apps/sodo-search/package.json
+++ b/apps/sodo-search/package.json
@@ -17,7 +17,7 @@
     "registry": "https://registry.npmjs.org/"
   },
   "dependencies": {
-    "@tryghost/content-api": "1.11.7",
+    "@tryghost/content-api": "1.11.19",
     "flexsearch": "0.7.21",
     "react": "17.0.2",
     "react-dom": "17.0.2"
@@ -84,7 +84,7 @@
   "devDependencies": {
     "@testing-library/jest-dom": "5.16.5",
     "@testing-library/react": "12.1.5",
-    "@vitejs/plugin-react": "4.1.0",
+    "@vitejs/plugin-react": "4.1.1",
     "nock": "13.3.3",
     "vite": "4.5.0",
     "vite-plugin-svgr": "3.3.0",
diff --git a/ghost/adapter-cache-redis/lib/AdapterCacheRedis.js b/ghost/adapter-cache-redis/lib/AdapterCacheRedis.js
index 93644da5b62..9c3a5741309 100644
--- a/ghost/adapter-cache-redis/lib/AdapterCacheRedis.js
+++ b/ghost/adapter-cache-redis/lib/AdapterCacheRedis.js
@@ -13,6 +13,7 @@ class AdapterCacheRedis extends BaseCacheAdapter {
      * @param {Number} [config.port] - redis port used in case no cache instance provided
      * @param {String} [config.password] - redis password used in case no cache instance provided
      * @param {Object} [config.clusterConfig] - redis cluster config used in case no cache instance provided
+     * @param {Object} [config.storeConfig] - extra redis client config used in case no cache instance provided
      * @param {Number} [config.ttl] - default cached value Time To Live (expiration) in *seconds*
      * @param {String} [config.keyPrefix] - prefix to use when building a unique cache key, e.g.: 'some_id:image-sizes:'
      * @param {Boolean} [config.reuseConnection] - specifies if the redis store/connection should be reused within the process
@@ -38,7 +39,9 @@ class AdapterCacheRedis extends BaseCacheAdapter {
                 ttl: config.ttl,
                 host: config.host,
                 port: config.port,
+                username: config.username,
                 password: config.password,
+                ...config.storeConfig,
                 clusterConfig: config.clusterConfig
             };
             const store = redisStoreFactory.getRedisStore(storeOptions, config.reuseConnection);
diff --git a/ghost/adapter-cache-redis/test/adapter-cache-redis.test.js b/ghost/adapter-cache-redis/test/adapter-cache-redis.test.js
index 4655c6e808f..459ffc94a73 100644
--- a/ghost/adapter-cache-redis/test/adapter-cache-redis.test.js
+++ b/ghost/adapter-cache-redis/test/adapter-cache-redis.test.js
@@ -27,6 +27,20 @@ describe('Adapter Cache Redis', function () {
         assert.ok(cache);
     });
 
+    it('can initialize with storeConfig', async function () {
+        const cache = new RedisCache({
+            username: 'myusername',
+            storeConfig: {
+                retryStrategy: false,
+                lazyConnect: true
+            },
+            reuseConnection: false
+        });
+        assert.ok(cache);
+        assert.equal(cache.redisClient.options.username, 'myusername');
+        assert.equal(cache.redisClient.options.retryStrategy, false);
+    });
+
     describe('get', function () {
         it('can get a value from the cache', async function () {
             const redisCacheInstanceStub = {
diff --git a/ghost/admin/app/README.md b/ghost/admin/app/README.md
index 87416f5d9df..535aefb6f6c 100644
--- a/ghost/admin/app/README.md
+++ b/ghost/admin/app/README.md
@@ -25,6 +25,6 @@ All of these separate files are subsequently imported and compiled in `app.css`.
 * Always a space after a property's colon (.e.g, display: block; and not display:block;).
 * End all lines with a semi-colon.
 * For multiple, comma-separated selectors, place each selector on its own line.
-* Use js- prefixed classes for JavaScript hooks into the DOM, and never use these in CSS as per [Slightly Obtrusive JavaSript](http://ozmm.org/posts/slightly_obtrusive_javascript.html)
+* Use js- prefixed classes for JavaScript hooks into the DOM, and never use these in CSS as per [Slightly Obtrusive JavaScript](http://ozmm.org/posts/slightly_obtrusive_javascript.html)
 * Avoid over-nesting CSS. Never nest more than 3 levels deep.
 * Use comments to explain "why" not "what" (Good: This requires a z-index in order to appear above mobile navigation. Bad: This is a thing which is always on top!)
diff --git a/ghost/admin/app/components/admin-x/settings.js b/ghost/admin/app/components/admin-x/settings.js
index e061d19ab52..00148d6639f 100644
--- a/ghost/admin/app/components/admin-x/settings.js
+++ b/ghost/admin/app/components/admin-x/settings.js
@@ -279,6 +279,7 @@ const fetchSettings = function () {
 const emberDataTypeMapping = {
     IntegrationsResponseType: {type: 'integration'},
     InvitesResponseType: {type: 'invite'},
+    OffersResponseType: {type: 'offer'},
     NewslettersResponseType: {type: 'newsletter'},
     RecommendationResponseType: {type: 'recommendation'},
     SettingsResponseType: {type: 'setting', singleton: true},
@@ -310,11 +311,7 @@ export default class AdminXSettings extends Component {
         console.error(error); // eslint-disable-line
 
         if (this.config.sentry_dsn) {
-            Sentry.captureException(error, {
-                tags: {
-                    adminx: true
-                }
-            });
+            Sentry.captureException(error);
         }
 
         // don't rethrow, app should attempt to gracefully recover
@@ -437,7 +434,7 @@ export default class AdminXSettings extends Component {
                             externalNavigate={this.externalNavigate}
                             darkMode={this.feature.nightShift}
                             unsplashConfig={defaultUnsplashHeaders}
-                            sentry={this.config.sentry_dsn ? Sentry : undefined}
+                            sentryDSN={this.config.sentry_dsn ?? null}
                             fetchKoenigLexical={fetchKoenigLexical}
                             onUpdate={this.onUpdate}
                             onInvalidate={this.onInvalidate}
diff --git a/ghost/admin/app/components/announcement-settings/background.hbs b/ghost/admin/app/components/announcement-settings/background.hbs
deleted file mode 100644
index 2f65da5292b..00000000000
--- a/ghost/admin/app/components/announcement-settings/background.hbs
+++ /dev/null
@@ -1,22 +0,0 @@
-<div class="gh-stack-item {{if (eq @index 0) "gh-setting-first" "gh-setting"}}">
-    <div class="flex-grow-1">
-        <div class="flex justify-between items-center relative">
-            <label class="gh-setting-title" for="announcement-background">
-                Background color
-            </label>
-
-            <div class="kg-settings-panel-control-input">
-                <div class="gh-btn-group kg-settings-headerstyle-btn-group">
-                    {{#each this.options as |settingOption|}}
-                        <button
-                            class="gh-btn {{settingOption.className}} {{if (eq this.background settingOption.value) "gh-btn-group-selected"}}"
-                            type="button"
-                            title={{settingOption.label}}
-                            {{on "click" (fn this.setBackground settingOption.value)}}
-                        ></button>
-                    {{/each}}
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
\ No newline at end of file
diff --git a/ghost/admin/app/components/announcement-settings/background.js b/ghost/admin/app/components/announcement-settings/background.js
deleted file mode 100644
index b1051671ef3..00000000000
--- a/ghost/admin/app/components/announcement-settings/background.js
+++ /dev/null
@@ -1,25 +0,0 @@
-import Component from '@glimmer/component';
-import {action} from '@ember/object';
-import {inject as service} from '@ember/service';
-
-export default class AnnouncementSettingsBackgroundComponent extends Component {
-    @service settings;
-
-    get background() {
-        return this.settings.announcementBackground;
-    }
-
-    get options() {
-        return [
-            {value: 'dark', label: 'Dark', className: 'kg-headerstyle-btn-dark'},
-            {value: 'light', label: 'Light', className: 'kg-headerstyle-btn-light'},
-            {value: 'accent', label: 'Accent', className: 'kg-headerstyle-btn-accent'}
-        ];
-    }
-
-    @action
-    setBackground(value) {
-        this.settings.announcementBackground = value;
-        this.args.onChange?.();
-    }
-}
diff --git a/ghost/admin/app/components/announcement-settings/content.hbs b/ghost/admin/app/components/announcement-settings/content.hbs
deleted file mode 100644
index b705469c954..00000000000
--- a/ghost/admin/app/components/announcement-settings/content.hbs
+++ /dev/null
@@ -1,15 +0,0 @@
-<div class="gh-stack-item gh-setting-first">
-    <div class="flex-grow-1">
-        <label class="gh-setting-title gh-theme-setting-title" for={{this.selectId}}>
-            Announcement
-        </label>
-        <div class="gh-announcement-editor {{if this.feature.nightShift "dark"}}">
-            <KoenigLexicalEditorInput
-                @placeholderText="Highlight breaking news, special offers, or important updates"
-                @html={{this.content}}
-                @onChangeHtml={{this.setContent}}
-                @onBlur={{@onChange}}
-            />
-        </div>
-    </div>
-</div>
\ No newline at end of file
diff --git a/ghost/admin/app/components/announcement-settings/content.js b/ghost/admin/app/components/announcement-settings/content.js
deleted file mode 100644
index 3dd7a1fb5b9..00000000000
--- a/ghost/admin/app/components/announcement-settings/content.js
+++ /dev/null
@@ -1,31 +0,0 @@
-import Component from '@glimmer/component';
-import cleanBasicHtml from '@tryghost/kg-clean-basic-html';
-import {action} from '@ember/object';
-import {inject as service} from '@ember/service';
-
-export default class AnnouncementSettingsContentComponent extends Component {
-    @service feature;
-    @service settings;
-
-    get content() {
-        const content = this.settings.announcementContent;
-        if (!content) {
-            return null;
-        }
-        // wrap in a paragraph, so it gets parsed correctly
-        return this.hasParagraphWrapper(content) ? content : `<p>${content}</p>`;
-    }
-
-    hasParagraphWrapper(html) {
-        const domParser = new DOMParser();
-        const doc = domParser.parseFromString(html, 'text/html');
-
-        return doc.body?.firstElementChild?.tagName === 'P';
-    }
-
-    @action
-    setContent(html) {
-        const cleanedHtml = cleanBasicHtml(html || '', {firstChildInnerContent: true});
-        this.settings.announcementContent = cleanedHtml;
-    }
-}
diff --git a/ghost/admin/app/components/announcement-settings/visibility.hbs b/ghost/admin/app/components/announcement-settings/visibility.hbs
deleted file mode 100644
index 7e7d5e2fafe..00000000000
--- a/ghost/admin/app/components/announcement-settings/visibility.hbs
+++ /dev/null
@@ -1,72 +0,0 @@
-<div class="gh-stack-item gh-setting-last">
-    <div class="flex-grow-1">
-        <label class="gh-setting-title gh-theme-setting-title" for="logged-out">
-            Visibility
-        </label>
-
-        <div class="form-group mt3 mb0 for-checkbox">
-            <label class="checkbox" for="logged-out">
-                <input
-                    type="checkbox"
-                    id="logged-out"
-                    name="logged-out"
-                    class="gh-input"
-                    value={{this.visibilityOptions.visitors}}
-                    checked={{this.isVisitorsChecked}}
-                    {{on "click" this.updateVisibility}}
-                >
-                <span class="input-toggle-component"></span>
-            {{#if this.isMembersEnabled}}
-                <span>Logged out visitors</span>
-            {{else}}
-                <span>Show the announcement</span>
-            {{/if}}
-            </label>
-
-            {{#if this.isMembersEnabled}}
-            {{#if this.isPaidAvailable}}
-                <label class="checkbox" for="free" data-testid="announcement-bar-free-member-label">
-                    <input
-                        type="checkbox"
-                        id="free"
-                        name="free"
-                        class="gh-input"
-                        value={{this.visibilityOptions.freeMembers}}
-                        checked={{this.isFreeMembersChecked}}
-                        data-testid="announcement-bar-free-member-input"
-                        {{on "click" this.updateVisibility}}
-                    >
-                    <span class="input-toggle-component"></span>
-                    <span>Free members</span>
-                </label>
-                <label class="checkbox" for="paid">
-                    <input
-                        type="checkbox"
-                        id="paid"
-                        name="paid"
-                        class="gh-input"
-                        value={{this.visibilityOptions.paidMembers}}
-                        checked={{this.isPaidMembersChecked}}
-                        {{on "click" this.updateVisibility}}
-                    >
-                    <span class="input-toggle-component"></span>
-                    <span>Paid members</span>
-                </label>
-            {{else}}
-                <label class="checkbox">
-                    <input
-                        type="checkbox"
-                        name="members"
-                        class="gh-input"
-                        value={{this.visibilityOptions.freeMembers}}
-                        checked={{this.isFreeMembersChecked}}
-                        {{on "click" this.updateVisibility}}
-                    >
-                    <span class="input-toggle-component"></span>
-                    <span>Members</span>
-                </label>
-            {{/if}}
-            {{/if}}
-        </div>
-    </div>
-</div>
\ No newline at end of file
diff --git a/ghost/admin/app/components/announcement-settings/visibility.js b/ghost/admin/app/components/announcement-settings/visibility.js
deleted file mode 100644
index ea889967925..00000000000
--- a/ghost/admin/app/components/announcement-settings/visibility.js
+++ /dev/null
@@ -1,56 +0,0 @@
-import Component from '@glimmer/component';
-import {action} from '@ember/object';
-import {inject as service} from '@ember/service';
-
-export default class AnnouncementSettingsVisibilityComponent extends Component {
-    @service settings;
-    @service membersUtils;
-
-    visibilityOptions = {
-        freeMembers: 'free_members',
-        paidMembers: 'paid_members',
-        visitors: 'visitors'
-    };
-
-    get visibilitySettings() {
-        return this.settings.announcementVisibility || [];
-    }
-
-    get isPaidAvailable() {
-        return this.membersUtils.isStripeEnabled;
-    }
-
-    get isFreeMembersChecked() {
-        return this.visibilitySettings.includes(this.visibilityOptions.freeMembers);
-    }
-
-    get isPaidMembersChecked() {
-        return this.visibilitySettings.includes(this.visibilityOptions.paidMembers);
-    }
-
-    get isVisitorsChecked() {
-        return this.visibilitySettings.includes(this.visibilityOptions.visitors);
-    }
-
-    get isMembersEnabled() {
-        return this.settings.membersEnabled;
-    }
-
-    @action
-    updateVisibility(event) {
-        let updatedVisibilityOptions = [...this.visibilitySettings];
-        const value = event.target.value;
-
-        if (event.target.checked) {
-            updatedVisibilityOptions.push(value);
-        } else {
-            updatedVisibilityOptions = updatedVisibilityOptions.filter(item => item !== value);
-        }
-
-        this.settings.announcementVisibility = updatedVisibilityOptions;
-        // update preview if there are no visibility options or just one to avoid update flickering on every check
-        if (!updatedVisibilityOptions.length || updatedVisibilityOptions.length === 1) {
-            this.args.onChange?.();
-        }
-    }
-}
diff --git a/ghost/admin/app/components/custom-theme-settings/boolean.hbs b/ghost/admin/app/components/custom-theme-settings/boolean.hbs
deleted file mode 100644
index e66f09e4275..00000000000
--- a/ghost/admin/app/components/custom-theme-settings/boolean.hbs
+++ /dev/null
@@ -1,20 +0,0 @@
-<div class="gh-stack-item {{if (eq @index 0) "gh-setting-first" "gh-setting"}} gh-setting-boolean">
-    <div class="flex-grow-1">
-        <div class="flex justify-between items-start relative">
-            <div class="flex flex-column mr5">
-                <span class="gh-setting-title {{if @setting.description '' 'mb0'}}" for={{this.checkboxId}}>
-                    {{humanize-setting-key @setting.key}}
-                </span>
-                {{#if @setting.description}}
-                    <div class="gh-setting-desc">{{truncate @setting.description 100}}</div>
-                {{/if}}
-            </div>
-            <div class="for-switch x-small" style={{html-safe (concat "margin-top: " (unless @setting.description '-6px' '0') ";")}}>
-                <label for={{this.checkboxId}} class="switch">
-                    <input type="checkbox" class="gh-input" id={{this.checkboxId}} checked={{@setting.value}} {{on "input" this.toggleValue}}>
-                    <span class="input-toggle-component mt1"></span>
-                </label>
-            </div>
-        </div>
-    </div>
-</div>
\ No newline at end of file
diff --git a/ghost/admin/app/components/custom-theme-settings/boolean.js b/ghost/admin/app/components/custom-theme-settings/boolean.js
deleted file mode 100644
index 016b4da7906..00000000000
--- a/ghost/admin/app/components/custom-theme-settings/boolean.js
+++ /dev/null
@@ -1,16 +0,0 @@
-import Component from '@glimmer/component';
-import {action} from '@ember/object';
-import {camelize} from '@ember/string';
-import {guidFor} from '@ember/object/internals';
-
-export default class CustomThemeSettingsBooleanComponent extends Component {
-    checkboxId = `checkbox-${guidFor(this)}`;
-    checkboxName = camelize(this.args.setting.key);
-
-    @action
-    toggleValue(changeEvent) {
-        const value = changeEvent.target.checked;
-        this.args.setting.set('value', value);
-        this.args.onChange?.();
-    }
-}
diff --git a/ghost/admin/app/components/custom-theme-settings/color.hbs b/ghost/admin/app/components/custom-theme-settings/color.hbs
deleted file mode 100644
index ed43446922e..00000000000
--- a/ghost/admin/app/components/custom-theme-settings/color.hbs
+++ /dev/null
@@ -1,43 +0,0 @@
-<div class="gh-stack-item {{if (eq @index 0) "gh-setting-first" "gh-setting"}}">
-    <div class="{{if @setting.description "gh-setting-content" "flex flex-column justify-center"}}">
-        <label class="gh-setting-title" style="{{if (is-empty @setting.description) "margin-bottom: 0px"}}" for={{this.inputId}}>
-            {{humanize-setting-key @setting.key}}
-        </label>
-        {{#if @setting.description}}
-            <div class="gh-setting-desc">{{truncate @setting.description 100}}</div>
-        {{/if}}
-        {{#if this.isInvalid}}
-            <div class="gh-setting-error {{if (is-empty @setting.description) "mt3"}}">Enter a color in hex format</div>
-        {{/if}}
-    </div>
-    <div class="gh-setting-action">
-        <div class="input-color">
-            <input
-                type="text"
-                id={{this.inputId}}
-                name={{this.inputName}}
-                autocorrect="off"
-                maxlength="6"
-                value={{this.colorWithoutHash}}
-                class="gh-input"
-                {{on "input" (perform this.debounceValueUpdate)}}
-                {{on "blur" this.updateValue}}
-                {{on-key "Enter" this.blurElement}}
-                data-test-input="accentColor"
-            />
-            <div class="color-picker-horizontal-divider"></div>
-            <div
-                class="color-box-container"
-                style={{this.this.colorPickerBgStyle}}
-            >
-                <input
-                    type="color"
-                    name={{this.inputName}}
-                    class="color-picker"
-                    value={{@setting.value}}
-                    {{on "input" (perform this.debounceValueUpdate)}}
-                >
-            </div>
-        </div>
-    </div>
-</div>
\ No newline at end of file
diff --git a/ghost/admin/app/components/custom-theme-settings/color.js b/ghost/admin/app/components/custom-theme-settings/color.js
deleted file mode 100644
index 6264d159b85..00000000000
--- a/ghost/admin/app/components/custom-theme-settings/color.js
+++ /dev/null
@@ -1,65 +0,0 @@
-import Component from '@glimmer/component';
-import {action} from '@ember/object';
-import {camelize} from '@ember/string';
-import {guidFor} from '@ember/object/internals';
-import {htmlSafe} from '@ember/template';
-import {task, timeout} from 'ember-concurrency';
-import {tracked} from '@glimmer/tracking';
-
-export default class CustomThemeSettingsColorComponent extends Component {
-    inputId = `input-${guidFor(this)}`;
-    inputName = camelize(this.args.setting.key);
-
-    @tracked isInvalid = false;
-
-    get colorWithoutHash() {
-        const color = this.args.setting.value;
-        if (color && color[0] === '#') {
-            return color.slice(1);
-        }
-        return color;
-    }
-
-    get colorPickerBgStyle() {
-        return htmlSafe(`background-color: ${this.args.setting.value || '#ffffff'}`);
-    }
-
-    @action
-    updateValue(event) {
-        const oldColor = this.args.setting.value;
-        let newColor = event.target.value;
-
-        if (!newColor) {
-            this.isInvalid = true;
-            return;
-        }
-
-        if (newColor[0] !== '#') {
-            newColor = `#${newColor}`;
-        }
-
-        if (newColor.match(/#[0-9A-Fa-f]{6}$/)) {
-            this.isInvalid = false;
-
-            if (newColor === oldColor) {
-                return;
-            }
-
-            this.args.setting.set('value', newColor);
-            this.args.onChange?.();
-        } else {
-            this.isInvalid = true;
-        }
-    }
-
-    @task({restartable: true})
-    *debounceValueUpdate(event) {
-        yield timeout(500);
-        this.updateValue(event);
-    }
-
-    @action
-    blurElement(event) {
-        event.target.blur();
-    }
-}
diff --git a/ghost/admin/app/components/custom-theme-settings/image.hbs b/ghost/admin/app/components/custom-theme-settings/image.hbs
deleted file mode 100644
index c0b6b404836..00000000000
--- a/ghost/admin/app/components/custom-theme-settings/image.hbs
+++ /dev/null
@@ -1,38 +0,0 @@
-<div class="gh-stack-item {{if (eq @index 0) "gh-setting-first" "gh-setting"}}">
-    <GhUploader
-        @extensions={{this.imageExtensions}}
-        @onComplete={{this.imageUploaded}}
-        as |uploader|
-    >
-        <div class="{{if @setting.value "" "flex flex-grow-1 items-center justify-between"}}">
-            <div class="gh-setting-content">
-                <div class="gh-setting-title mb0 {{if @setting.value "gh-theme-setting-title"}}">{{humanize-setting-key @setting.key}}</div>
-                {{#each uploader.errors as |error|}}
-                    <div class="gh-setting-error" data-test-error="icon">{{or error.context error.message}}</div>
-                {{/each}}
-                {{#if @setting.description}}
-                    <div class="gh-setting-desc" style="margin-top: 8px">{{truncate @setting.description 100}}</div>
-                {{/if}}
-            </div>
-            <div class="gh-setting-action gh-uploadbutton-container flex flex-column items-stretch">
-                {{#if uploader.isUploading}}
-                    {{uploader.progressBar}}
-                {{else if @setting.value}}
-                    <div class="gh-branding-image-container largeimg justify-start">
-                        <img class="blog-cover" src={{@setting.value}} {{on "click" uploader.triggerFileDialog}}>
-                        <button type="button" class="gh-setting-action-largeimg-delete" {{on "click" (fn this.updateValue null)}} data-test-delete-image="icon">
-                            {{svg-jar "trash" class="w4 h4 fill-white-no-conflict"}}
-                        </button>
-                    </div>
-                {{else}}
-                    <button type="button" class="gh-btn gh-btn-white self-start" {{on "click" uploader.triggerFileDialog}} data-test-image-upload-btn="icon">
-                        <span>Upload</span>
-                    </button>
-                {{/if}}
-                <div style="display:none">
-                    <GhFileInput @multiple={{false}} @action={{uploader.setFiles}} @accept={{this.imageMimeTypes}} @onInsert={{uploader.registerFileInput}} data-test-file-input="icon" />
-                </div>
-            </div>
-        </div>
-    </GhUploader>
-</div>
\ No newline at end of file
diff --git a/ghost/admin/app/components/custom-theme-settings/image.js b/ghost/admin/app/components/custom-theme-settings/image.js
deleted file mode 100644
index 27d9fb468b5..00000000000
--- a/ghost/admin/app/components/custom-theme-settings/image.js
+++ /dev/null
@@ -1,29 +0,0 @@
-import Component from '@glimmer/component';
-import {
-    IMAGE_EXTENSIONS,
-    IMAGE_MIME_TYPES
-} from 'ghost-admin/components/gh-image-uploader';
-import {action} from '@ember/object';
-import {camelize} from '@ember/string';
-import {guidFor} from '@ember/object/internals';
-
-export default class CustomThemeSettingsImageComponent extends Component {
-    inputId = `input-${guidFor(this)}`;
-    inputName = camelize(this.args.setting.key);
-
-    imageExtensions = IMAGE_EXTENSIONS;
-    imageMimeTypes = IMAGE_MIME_TYPES;
-
-    @action
-    imageUploaded(images) {
-        if (images[0]) {
-            this.updateValue(images[0].url);
-        }
-    }
-
-    @action
-    updateValue(value) {
-        this.args.setting.set('value', value);
-        this.args.onChange?.();
-    }
-}
diff --git a/ghost/admin/app/components/custom-theme-settings/select.hbs b/ghost/admin/app/components/custom-theme-settings/select.hbs
deleted file mode 100644
index 34c44ee5c9f..00000000000
--- a/ghost/admin/app/components/custom-theme-settings/select.hbs
+++ /dev/null
@@ -1,20 +0,0 @@
-<div class="gh-stack-item {{if (eq @index 0) "gh-setting-first" "gh-setting"}}">
-    <div class="flex-grow-1">
-        <label class="gh-setting-title gh-theme-setting-title" for={{this.selectId}}>
-            {{humanize-setting-key @setting.key}}
-        </label>
-        <span class="gh-select">
-            <select class="ember-select" name={{this.selectName}} id={{this.selectId}} {{on "change" this.setSelection}}>
-                {{#each @setting.options as |settingOption|}}
-                    <option value={{settingOption}} selected={{eq settingOption @setting.value}}>
-                        {{settingOption}}
-                    </option>
-                {{/each}}
-            </select>
-            {{svg-jar "arrow-down-small"}}
-        </span>
-        {{#if @setting.description}}
-            <div class="gh-setting-desc">{{truncate @setting.description 100}}</div>
-        {{/if}}
-    </div>
-</div>
\ No newline at end of file
diff --git a/ghost/admin/app/components/custom-theme-settings/select.js b/ghost/admin/app/components/custom-theme-settings/select.js
deleted file mode 100644
index afbac85534a..00000000000
--- a/ghost/admin/app/components/custom-theme-settings/select.js
+++ /dev/null
@@ -1,16 +0,0 @@
-import Component from '@glimmer/component';
-import {action} from '@ember/object';
-import {camelize} from '@ember/string';
-import {guidFor} from '@ember/object/internals';
-
-export default class CustomThemeSettingsSelectComponent extends Component {
-    selectId = `select-${guidFor(this)}`;
-    selectName = camelize(this.args.setting.key);
-
-    @action
-    setSelection(changeEvent) {
-        const value = changeEvent.target.value;
-        this.args.setting.set('value', value);
-        this.args.onChange?.();
-    }
-}
diff --git a/ghost/admin/app/components/custom-theme-settings/text.hbs b/ghost/admin/app/components/custom-theme-settings/text.hbs
deleted file mode 100644
index b62c0e79f96..00000000000
--- a/ghost/admin/app/components/custom-theme-settings/text.hbs
+++ /dev/null
@@ -1,19 +0,0 @@
-<div class="gh-stack-item {{if (eq @index 0) "gh-setting-first" "gh-setting"}}">
-    <div class="flex-grow-1">
-        <label class="gh-setting-title gh-theme-setting-title" for={{this.inputId}}>
-            {{humanize-setting-key @setting.key}}
-        </label>
-        <input
-            type="text"
-            class="gh-input"
-            value={{@setting.value}}
-            id={{this.inputId}}
-            name={{this.inputName}}
-            {{on "input" this.updateValue}}
-            {{on "blur" this.triggerOnChange}}
-        />
-        {{#if @setting.description}}
-            <div class="gh-setting-desc">{{truncate @setting.description 100}}</div>
-        {{/if}}
-    </div>
-</div>
\ No newline at end of file
diff --git a/ghost/admin/app/components/custom-theme-settings/text.js b/ghost/admin/app/components/custom-theme-settings/text.js
deleted file mode 100644
index 0f1a7e92a8a..00000000000
--- a/ghost/admin/app/components/custom-theme-settings/text.js
+++ /dev/null
@@ -1,19 +0,0 @@
-import Component from '@glimmer/component';
-import {action} from '@ember/object';
-import {camelize} from '@ember/string';
-import {guidFor} from '@ember/object/internals';
-
-export default class CustomThemeSettingsTextComponent extends Component {
-    inputId = `input-${guidFor(this)}`;
-    inputName = camelize(this.args.setting.key);
-
-    @action
-    updateValue(event) {
-        this.args.setting.set('value', event.target.value);
-    }
-
-    @action
-    triggerOnChange() {
-        this.args.onChange?.();
-    }
-}
diff --git a/ghost/admin/app/components/gh-benefit-item.hbs b/ghost/admin/app/components/gh-benefit-item.hbs
deleted file mode 100644
index 21738c8a2c0..00000000000
--- a/ghost/admin/app/components/gh-benefit-item.hbs
+++ /dev/null
@@ -1,46 +0,0 @@
-<div
-    class="gh-blognav-item {{unless @benefitItem.isNew "gh-blognav-item--sortable"}}"
-    {{validation-status errorClass="gh-blognav-item--error" errors=@benefitItem.errors}}
-    ...attributes
->
-    {{#unless @benefitItem.isNew}}
-        <span class="gh-blognav-grab">
-            {{svg-jar "grab"}}
-            <span class="sr-only">Reorder</span>
-        </span>
-    {{/unless}}
-
-    <div class="gh-blognav-line {{unless @benefitItem.name "placeholder"}}">
-        {{svg-jar "check-2"}}
-        <span
-            class="gh-blognav-label"
-            {{validation-status errors=@benefitItem.errors property="name" hasValidated=@benefitItem.hasValidated}}
-        >
-            <GhTrimFocusInput
-                @shouldFocus={{@benefitItem.last}}
-                @placeholder={{if this.isFreeTier "Access to all public posts" "Expert analysis"}}
-                @value={{readonly @benefitItem.name}}
-                @input={{this.handleLabelInput}}
-                @keyPress={{this.clearLabelErrors}}
-                @stopEnterKeyDownPropagation={{true}}
-                @focus-out={{fn this.updateLabel @benefitItem.name}}
-                data-test-input="benefit-label" />
-
-            <GhErrorMessage
-                @errors={{@benefitItem.errors}}
-                @property="name"
-                data-test-error="benefit-label" />
-        </span>
-    </div>
-
-    {{#if @benefitItem.isNew}}
-        <button type="button" class="gh-blognav-add" {{on "click" (fn @addItem @benefitItem)}} data-test-button="add-benefit">
-            {{svg-jar "plus"}}<span class="sr-only">Add</span>
-        </button>
-    {{else}}
-        <button type="button" class="gh-blognav-delete" {{on "click" (fn @deleteItem @benefitItem)}} data-test-button="delete-benefit">
-            {{svg-jar "trash"}}<span class="sr-only">Delete</span>
-        </button>
-    {{/if}}
-
-</div>
\ No newline at end of file
diff --git a/ghost/admin/app/components/gh-benefit-item.js b/ghost/admin/app/components/gh-benefit-item.js
deleted file mode 100644
index ec32702510f..00000000000
--- a/ghost/admin/app/components/gh-benefit-item.js
+++ /dev/null
@@ -1,19 +0,0 @@
-import Component from '@glimmer/component';
-import {action} from '@ember/object';
-
-export default class GhBenefitItem extends Component {
-    @action
-    handleLabelInput(event) {
-        this.updateLabel(event.target.value);
-    }
-
-    @action
-    updateLabel(value) {
-        this.args.updateLabel(value, this.args.benefitItem);
-    }
-
-    @action
-    clearLabelErrors() {
-        this.args.benefitItem.errors?.remove('name');
-    }
-}
diff --git a/ghost/admin/app/components/gh-editor-feature-image.hbs b/ghost/admin/app/components/gh-editor-feature-image.hbs
index 411e3eae872..aaf68c256af 100644
--- a/ghost/admin/app/components/gh-editor-feature-image.hbs
+++ b/ghost/admin/app/components/gh-editor-feature-image.hbs
@@ -1,8 +1,6 @@
 {{!-- template-lint-disable no-invalid-interactive --}}
 <div
     class="gh-editor-feature-image-container"
-    {{on "mouseover" (fn (mut this.isHovered) true)}}
-    {{on "mouseleave" (fn (mut this.isHovered) false)}}
 >
 {{!-- template-lint-enable no-invalid-interactive --}}
     <GhUploader
@@ -40,10 +38,6 @@
                 <span class="gh-editor-hidden-indicator" data-tooltip="Feature image and post title are hidden on page">
                     {{svg-jar "eye-closed"}}
                 </span>
-            {{else}}
-                <span class="gh-editor-feature-image-indicator" data-tooltip="A feature image is publicly visible to anyone">
-                    {{svg-jar "feature-image"}}
-                </span>
             {{/if}}
             <div class="gh-editor-feature-image">
                 <img src={{@image}} alt={{@alt}} role={{if @alt "img" "presentation"}} class="{{if @isHidden "faded"}}">
@@ -75,7 +69,7 @@
                         @onChangeHtml={{this.setCaption}}
                         @placeholderText={{if this.captionInputFocused "" "Add a caption to the feature image"}}
                         @onFocus={{fn (mut this.captionInputFocused) true}}
-                        @onBlur={{fn (mut this.captionInputFocused) false}}
+                        @onBlur={{this.handleCaptionBlur}}
                     />
                 {{/if}}
                 <button
@@ -87,7 +81,7 @@
             </div>
         {{else}}
             {{!-- no-image state --}}
-            <div class="flex flex-row items-center {{if this.hideButton "invisible"}}">
+            <div class="flex flex-row items-center">
                 {{#if this.canDrop}}
                     <div class="gh-editor-feature-image-add-button"><span>Drop to upload feature image</span></div>
                 {{else}}
diff --git a/ghost/admin/app/components/gh-editor-feature-image.js b/ghost/admin/app/components/gh-editor-feature-image.js
index d6b6b6a2884..0bc821093df 100644
--- a/ghost/admin/app/components/gh-editor-feature-image.js
+++ b/ghost/admin/app/components/gh-editor-feature-image.js
@@ -15,15 +15,10 @@ export default class GhEditorFeatureImageComponent extends Component {
     @service settings;
 
     @tracked isEditingAlt = false;
-    @tracked isHovered = false;
     @tracked captionInputFocused = false;
     @tracked showUnsplashSelector = false;
     @tracked canDrop = false;
 
-    get hideButton() {
-        return !this.canDrop && !this.isHovered && !this.args.forceButtonDisplay;
-    }
-
     get caption() {
         const content = this.args.caption;
         if (!content) {
@@ -39,6 +34,12 @@ export default class GhEditorFeatureImageComponent extends Component {
         this.args.updateCaption(cleanedHtml);
     }
 
+    @action
+    handleCaptionBlur() {
+        this.captionInputFocused = false;
+        this.args.handleCaptionBlur();
+    }
+
     @action
     setUploadedImage(results) {
         if (results[0]) {
diff --git a/ghost/admin/app/components/gh-feature-flag.hbs b/ghost/admin/app/components/gh-feature-flag.hbs
deleted file mode 100644
index 8b04c56982a..00000000000
--- a/ghost/admin/app/components/gh-feature-flag.hbs
+++ /dev/null
@@ -1,12 +0,0 @@
-<input
-    type="checkbox"
-    data-test-toggle={{this.testKey}}
-    checked={{this.value}}
-    disabled={{this.disabled}}
-    id={{this.for}}
-    name={{this.name}}
-    onclick={{action (mut this.value) value="target.checked"}}
-    onchange={{@onChange}}
->
-<span class="input-toggle-component"></span>
-{{{yield}}}
diff --git a/ghost/admin/app/components/gh-feature-flag.js b/ghost/admin/app/components/gh-feature-flag.js
deleted file mode 100644
index f14ce966ae8..00000000000
--- a/ghost/admin/app/components/gh-feature-flag.js
+++ /dev/null
@@ -1,55 +0,0 @@
-import Component from '@ember/component';
-import classic from 'ember-classic-decorator';
-import {attributeBindings, classNames, tagName} from '@ember-decorators/component';
-import {computed, defineProperty} from '@ember/object';
-import {readOnly} from '@ember/object/computed';
-import {inject as service} from '@ember/service';
-
-@classic
-@tagName('label')
-@classNames('switch')
-@attributeBindings('for', 'disabled')
-class FeatureFlagComponent extends Component {
-    @service feature;
-
-    @computed('_disabled')
-    get disabled() {
-        if (this._disabled) {
-            return true;
-        }
-        return false;
-    }
-
-    @computed('_flagValue')
-    get value() {
-        return this._flagValue;
-    }
-
-    set value(value) {
-        this.set(`feature.${this.flag}`, value);
-    }
-
-    @computed('flag')
-    get for() {
-        return `labs-${this.flag}`;
-    }
-
-    @computed('flag')
-    get name() {
-        return `labs[${this.flag}]`;
-    }
-
-    get testKey() {
-        return `labs-${this.flag}`;
-    }
-
-    init() {
-        super.init(...arguments);
-
-        defineProperty(this, '_flagValue', readOnly(`feature.${this.flag}`), function () {
-            return this.get(`feature.${this.flag}`);
-        });
-    }
-}
-
-export default FeatureFlagComponent;
diff --git a/ghost/admin/app/components/gh-file-upload.hbs b/ghost/admin/app/components/gh-file-upload.hbs
deleted file mode 100644
index 6f17a4b7c3b..00000000000
--- a/ghost/admin/app/components/gh-file-upload.hbs
+++ /dev/null
@@ -1,4 +0,0 @@
-<input class="gh-input gh-input-file q" data-url="upload" type="file" name="importfile" accept="{{this.acceptEncoding}}">
-<button id="startupload" class="gh-btn gh-btn-hover-blue" type="submit" disabled={{this.uploadButtonDisabled}} {{action "upload"}}>
-    <span>{{this.uploadButtonText}}</span>
-</button>
diff --git a/ghost/admin/app/components/gh-file-upload.js b/ghost/admin/app/components/gh-file-upload.js
deleted file mode 100644
index a4450a677fe..00000000000
--- a/ghost/admin/app/components/gh-file-upload.js
+++ /dev/null
@@ -1,38 +0,0 @@
-import Component from '@ember/component';
-import classic from 'ember-classic-decorator';
-import {action} from '@ember/object';
-
-@classic
-export default class GhFileUpload extends Component {
-    _file = null;
-    acceptEncoding = null;
-    uploadButtonText = 'Text';
-    uploadButtonDisabled = true;
-    shouldResetForm = true;
-
-    // closure actions
-    onUpload() {}
-
-    onAdd() {}
-
-    @action
-    upload() {
-        if (!this.uploadButtonDisabled && this._file) {
-            this.onUpload(this._file);
-        }
-
-        // Prevent double post by disabling the button.
-        this.set('uploadButtonDisabled', true);
-
-        // Reset form
-        if (this.shouldResetForm) {
-            this.element.closest('form').reset();
-        }
-    }
-
-    change(event) {
-        this.set('uploadButtonDisabled', false);
-        this.onAdd();
-        this._file = event.target.files[0];
-    }
-}
diff --git a/ghost/admin/app/components/gh-file-uploader.hbs b/ghost/admin/app/components/gh-file-uploader.hbs
deleted file mode 100644
index 714dbb55442..00000000000
--- a/ghost/admin/app/components/gh-file-uploader.hbs
+++ /dev/null
@@ -1,22 +0,0 @@
-{{#if this.file}}
-    {{!-- Upload in progress! --}}
-    {{#if this.failureMessage}}
-        <div class="failed">
-            {{this.failureMessage}}
-            <GhFileInput @multiple={{false}} @alt={{this.labelText}} @action={{action "retry"}} @accept={{this.accept}} class="try-again">
-                <span class="red fw5 nl1" data-test-upload-try-again-button>Try again</span>
-            </GhFileInput>
-        </div>
-    {{else}}
-        <div class="progress">
-            <div class="bar" style={{this.progressStyle}}></div>
-        </div>
-    {{/if}}
-
-{{else}}
-    <div class="upload-form">
-        <GhFileInput @multiple={{false}} @alt={{this.labelText}} @action={{action "fileSelected"}} @accept={{this.accept}}>
-            <div class="description">{{this.labelText}}</div>
-        </GhFileInput>
-    </div>
-{{/if}}
diff --git a/ghost/admin/app/components/gh-file-uploader.js b/ghost/admin/app/components/gh-file-uploader.js
deleted file mode 100644
index bfd5684f8c4..00000000000
--- a/ghost/admin/app/components/gh-file-uploader.js
+++ /dev/null
@@ -1,272 +0,0 @@
-import Component from '@ember/component';
-import {GENERIC_ERROR_MESSAGE} from 'ghost-admin/services/notifications';
-import {
-    UnsupportedMediaTypeError,
-    isRequestEntityTooLargeError,
-    isUnsupportedMediaTypeError,
-    isVersionMismatchError
-} from 'ghost-admin/services/ajax';
-import {computed} from '@ember/object';
-import {htmlSafe} from '@ember/template';
-import {isBlank} from '@ember/utils';
-import {isArray as isEmberArray} from '@ember/array';
-import {run} from '@ember/runloop';
-import {inject as service} from '@ember/service';
-
-const DEFAULTS = {
-    accept: ['text/csv'],
-    extensions: ['csv']
-};
-
-export default Component.extend({
-    ajax: service(),
-    eventBus: service(),
-    notifications: service(),
-
-    tagName: 'section',
-    classNames: ['gh-image-uploader'],
-    classNameBindings: ['dragClass'],
-
-    labelText: 'Select or drag-and-drop a file',
-    url: null,
-    paramName: 'file',
-    accept: null,
-    extensions: null,
-    validate: null,
-
-    file: null,
-    response: null,
-
-    dragClass: null,
-    failureMessage: null,
-    uploadPercentage: 0,
-
-    // Allowed actions
-    fileSelected: () => {},
-    uploadStarted: () => {},
-    uploadFinished: () => {},
-    uploadSuccess: () => {},
-    uploadFailed: () => {},
-
-    formData: computed('file', function () {
-        let paramName = this.paramName;
-        let file = this.file;
-        let formData = new FormData();
-
-        formData.append(paramName, file);
-
-        return formData;
-    }),
-
-    progressStyle: computed('uploadPercentage', function () {
-        let percentage = this.uploadPercentage;
-        let width = '';
-
-        if (percentage > 0) {
-            width = `${percentage}%`;
-        } else {
-            width = '0';
-        }
-
-        return htmlSafe(`width: ${width}`);
-    }),
-
-    // we can optionally listen to a named event bus channel so that the upload
-    // process can be triggered externally
-    init() {
-        this._super(...arguments);
-        let listenTo = this.listenTo;
-
-        this.accept = this.accept || DEFAULTS.accept;
-        this.extensions = this.extensions || DEFAULTS.extensions;
-
-        this._uploadEventHandler = function (file) {
-            if (file) {
-                this.set('file', file);
-            }
-            this.send('upload');
-        };
-
-        if (listenTo) {
-            this.eventBus.subscribe(`${listenTo}:upload`, this, this._uploadEventHandler);
-        }
-    },
-
-    didReceiveAttrs() {
-        this._super(...arguments);
-        let accept = this.accept;
-        let extensions = this.extensions;
-
-        this._accept = (!isBlank(accept) && !isEmberArray(accept)) ? accept.split(',') : accept;
-        this._extensions = (!isBlank(extensions) && !isEmberArray(extensions)) ? extensions.split(',') : extensions;
-    },
-
-    willDestroyElement() {
-        let listenTo = this.listenTo;
-
-        this._super(...arguments);
-
-        if (listenTo) {
-            this.eventBus.unsubscribe(`${listenTo}:upload`, this, this._uploadEventHandler);
-        }
-    },
-
-    actions: {
-        fileSelected(fileList, resetInput) {
-            let [file] = Array.from(fileList);
-            let validationResult = this._validate(file);
-
-            this.set('file', file);
-            this.fileSelected(file);
-
-            if (validationResult === true) {
-                run.schedule('actions', this, function () {
-                    this.generateRequest();
-
-                    if (resetInput) {
-                        resetInput();
-                    }
-                });
-            } else {
-                this._uploadFailed(validationResult);
-
-                if (resetInput) {
-                    resetInput();
-                }
-            }
-        },
-
-        upload() {
-            if (this.file) {
-                this.generateRequest();
-            }
-        },
-
-        reset() {
-            this.set('file', null);
-            this.set('uploadPercentage', 0);
-            this.set('failureMessage', null);
-        },
-
-        retry() {
-            this.send('reset');
-            this.send('fileSelected', ...arguments);
-        }
-    },
-
-    dragOver(event) {
-        if (!event.dataTransfer) {
-            return;
-        }
-
-        // this is needed to work around inconsistencies with dropping files
-        // from Chrome's downloads bar
-        if (navigator.userAgent.indexOf('Chrome') > -1) {
-            let eA = event.dataTransfer.effectAllowed;
-            event.dataTransfer.dropEffect = (eA === 'move' || eA === 'linkMove') ? 'move' : 'copy';
-        }
-
-        event.stopPropagation();
-        event.preventDefault();
-
-        this.set('dragClass', '-drag-over');
-    },
-
-    dragLeave(event) {
-        event.preventDefault();
-        this.set('dragClass', null);
-    },
-
-    drop(event) {
-        event.preventDefault();
-        this.set('dragClass', null);
-        if (event.dataTransfer.files) {
-            this.send('fileSelected', event.dataTransfer.files);
-        }
-    },
-
-    generateRequest() {
-        let ajax = this.ajax;
-        let formData = this.formData;
-        let url = this.url;
-
-        this.uploadStarted();
-
-        ajax.post(url, {
-            data: formData,
-            processData: false,
-            contentType: false,
-            dataType: 'text',
-            xhr: () => {
-                let xhr = new window.XMLHttpRequest();
-
-                xhr.upload.addEventListener('progress', (event) => {
-                    this._uploadProgress(event);
-                }, false);
-
-                return xhr;
-            }
-        }).then((response) => {
-            this._uploadSuccess(JSON.parse(response));
-        }).catch((error) => {
-            this._uploadFailed(error);
-        }).finally(() => {
-            this.uploadFinished();
-        });
-    },
-
-    _uploadProgress(event) {
-        if (event.lengthComputable && !this.isDestroyed && !this.isDestroying) {
-            run(() => {
-                let percentage = Math.round((event.loaded / event.total) * 100);
-                this.set('uploadPercentage', percentage);
-            });
-        }
-    },
-
-    _uploadSuccess(response) {
-        this.uploadSuccess(response);
-        this.send('reset');
-    },
-
-    _uploadFailed(error) {
-        let message;
-
-        if (isVersionMismatchError(error)) {
-            this.notifications.showAPIError(error);
-        }
-
-        if (isUnsupportedMediaTypeError(error)) {
-            message = 'The file type you uploaded is not supported.';
-        } else if (isRequestEntityTooLargeError(error)) {
-            message = 'The file you uploaded was larger than the maximum file size your server allows.';
-        } else if (error.payload && error.payload.errors && !isBlank(error.payload.errors[0].message)) {
-            message = htmlSafe(error.payload.errors[0].message);
-        } else {
-            console.error(error); // eslint-disable-line
-            message = GENERIC_ERROR_MESSAGE;
-        }
-
-        this.set('failureMessage', message);
-        this.uploadFailed(error);
-    },
-
-    _validate(file) {
-        if (this.validate) {
-            return this.validate(file);
-        } else {
-            return this._defaultValidator(file);
-        }
-    },
-
-    _defaultValidator(file) {
-        let [, extension] = (/(?:\.([^.]+))?$/).exec(file.name);
-        let extensions = this._extensions;
-
-        if (!extension || extensions.indexOf(extension.toLowerCase()) === -1) {
-            return new UnsupportedMediaTypeError();
-        }
-
-        return true;
-    }
-});
diff --git a/ghost/admin/app/components/gh-font-selector.hbs b/ghost/admin/app/components/gh-font-selector.hbs
deleted file mode 100644
index a1e1631537c..00000000000
--- a/ghost/admin/app/components/gh-font-selector.hbs
+++ /dev/null
@@ -1,16 +0,0 @@
-<PowerSelect
-    @options={{this.options}}
-    @selected={{this.selectedOption}}
-    @onChange={{this.selectOption}}
-    @disabled={{eq this.settings.membersSignupAccess "none"}}
-    @renderInPlace={{true}}
-    @triggerClass="gh-setting-dropdown"
-    @dropdownClass="gh-setting-dropdown-list"
-    as |option|
->
-    <div class="gh-radio-label {{dasherize option.value}}">
-        <div class="description">
-            <h4>{{option.name}}</h4>
-        </div>
-    </div>
-</PowerSelect>
\ No newline at end of file
diff --git a/ghost/admin/app/components/gh-font-selector.js b/ghost/admin/app/components/gh-font-selector.js
deleted file mode 100644
index 93999d6c3ca..00000000000
--- a/ghost/admin/app/components/gh-font-selector.js
+++ /dev/null
@@ -1,25 +0,0 @@
-import Component from '@glimmer/component';
-import {action} from '@ember/object';
-
-export default class GhFontSelector extends Component {
-    get options() {
-        return [{
-            name: 'Elegant serif',
-            description: 'Beautiful lines with great readability',
-            value: 'serif'
-        }, {
-            name: 'Clean sans-serif',
-            description: 'A more minimal style with sharp lines',
-            value: 'sans_serif'
-        }];
-    }
-
-    get selectedOption() {
-        return this.options.find(o => o.value === this.args.selected);
-    }
-
-    @action
-    selectOption(option) {
-        this.args.onChange(option.value);
-    }
-}
diff --git a/ghost/admin/app/components/gh-koenig-editor-lexical.hbs b/ghost/admin/app/components/gh-koenig-editor-lexical.hbs
index f75af6debaa..5697bdfbf43 100644
--- a/ghost/admin/app/components/gh-koenig-editor-lexical.hbs
+++ b/ghost/admin/app/components/gh-koenig-editor-lexical.hbs
@@ -16,6 +16,7 @@
             @updateAlt={{@setFeatureImageAlt}}
             @caption={{@featureImageCaption}}
             @updateCaption={{@setFeatureImageCaption}}
+            @handleCaptionBlur={{@handleFeatureImageCaptionBlur}}
             @forceButtonDisplay={{or (not @title) (eq @title "(Untitled)") this.titleIsHovered this.titleIsFocused}}
             @isHidden={{or (not @cardOptions.post.showTitleAndFeatureImage) false}}
         />
diff --git a/ghost/admin/app/components/gh-membership-tiers-alpha.hbs b/ghost/admin/app/components/gh-membership-tiers-alpha.hbs
deleted file mode 100644
index 041f3a73f59..00000000000
--- a/ghost/admin/app/components/gh-membership-tiers-alpha.hbs
+++ /dev/null
@@ -1,55 +0,0 @@
-<div class="flex justify-between items-center">
-    <label>Tiers</label>
-    <div>
-        <div class="gh-contentfilter-menu gh-contentfilter-type {{if (not-eq this.selectedType.value "active") "gh-contentfilter-selected"}}" data-test-type-select="true">
-            <PowerSelect
-                @selected={{this.selectedType}}
-                @options={{this.availableTypes}}
-                @searchEnabled={{false}}
-                @onChange={{this.onTypeChange}}
-                @triggerComponent={{component "gh-power-select/trigger"}}
-                @triggerClass="gh-contentfilter-menu-trigger gh-contentfilter-menu-trigger-tiers"
-                @dropdownClass="gh-contentfilter-menu-dropdown"
-                @matchTriggerWidth={{false}}
-                data-test-select-tiers-list
-                as |type|
-            >
-                {{#if type.name}}{{type.name}}{{else}}<span class="red">Unknown type</span>{{/if}}
-            </PowerSelect>
-        </div>
-    </div>
-</div>
-<div class="gh-tier-cards">
-    {{#if this.isEmptyList}}
-    <div class="gh-main-content-card gh-tier-card-empty-state">
-        <p>You have no {{this.selectedType.value}} tiers.</p>
-    </div>
-    {{/if}}
-
-    {{#each this.tiers as |tier|}}
-        <GhTierCard
-            @tier={{tier}}
-            @openEditTier={{this.openEditTier}}
-            @onUnarchive={{this.onUnarchive}}
-            @onArchive={{this.onArchive}}
-        />
-    {{/each}}
-    {{#if (eq this.type "active" )}}
-        <div class="gh-tier-cards-footer">
-            <button class="gh-btn gh-btn-link gh-btn-text gh-btn-icon gh-btn-add-tier green" type="button" {{action "openNewTier" this.tier}}>
-                <span>{{svg-jar "plus"}}Add tier</span>
-            </button>
-        </div>
-    {{/if}}
-</div>
-
-{{#if this.showTierModal}}
-    <GhFullscreenModal
-        @modal="tier"
-        @model={{hash
-            tier=this.tierModel
-        }}
-        @confirm={{this.confirmTierSave}}
-        @close={{this.closeTierModal}}
-        @modifier="edit-tier action wide" />
-{{/if}}
diff --git a/ghost/admin/app/components/gh-membership-tiers-alpha.js b/ghost/admin/app/components/gh-membership-tiers-alpha.js
deleted file mode 100644
index c58703b8d28..00000000000
--- a/ghost/admin/app/components/gh-membership-tiers-alpha.js
+++ /dev/null
@@ -1,97 +0,0 @@
-import Component from '@glimmer/component';
-import {action} from '@ember/object';
-import {inject} from 'ghost-admin/decorators/inject';
-import {inject as service} from '@ember/service';
-import {tracked} from '@glimmer/tracking';
-
-const TYPES = [{
-    name: 'Active',
-    value: 'active'
-},{
-    name: 'Archived',
-    value: 'archived'
-}];
-
-export default class extends Component {
-    @service membersUtils;
-    @service ghostPaths;
-    @service ajax;
-    @service store;
-
-    @inject config;
-
-    @tracked showTierModal = false;
-    @tracked tierModel = null;
-    @tracked type = 'active';
-
-    get tiers() {
-        return this.args.tiers.filter((tier) => {
-            if (this.type === 'active') {
-                return !!tier.active;
-            } else if (this.type === 'archived') {
-                return !tier.active;
-            }
-
-            return true;
-        });
-    }
-
-    get availableTypes() {
-        return TYPES;
-    }
-
-    get selectedType() {
-        return this.type ? TYPES.find((d) => {
-            return this.type === d.value;
-        }) : TYPES[0];
-    }
-
-    get isEmptyList() {
-        return this.tiers.length === 0;
-    }
-
-    @action
-    onTypeChange(type) {
-        this.type = type.value;
-    }
-
-    @action
-    async openEditTier(tier) {
-        this.tierModel = tier;
-        this.showTierModal = true;
-    }
-
-    @action
-    async onUnarchive() {
-        this.type = 'active';
-        this.args.updatePortalPreview();
-        this.reloadTiers();
-    }
-
-    @action
-    async onArchive() {
-        this.args.updatePortalPreview();
-        this.reloadTiers();
-    }
-
-    reloadTiers() {
-        // Reload the cached tiers in membersutils
-        this.membersUtils.reload();
-    }
-
-    @action
-    async openNewTier() {
-        this.tierModel = this.store.createRecord('tier');
-        this.showTierModal = true;
-    }
-
-    @action
-    closeTierModal() {
-        this.showTierModal = false;
-    }
-
-    @action
-    confirmTierSave() {
-        this.args.confirmTierSave();
-    }
-}
diff --git a/ghost/admin/app/components/gh-nav-menu.hbs b/ghost/admin/app/components/gh-nav-menu.hbs
index d5a1b85c621..f7d7fd67cbc 100644
--- a/ghost/admin/app/components/gh-nav-menu.hbs
+++ b/ghost/admin/app/components/gh-nav-menu.hbs
@@ -1,7 +1,3 @@
-<nav class="gh-nav {{if this.ui.contextualNavMenu "gh-nav-contextual"}} {{if this.session.user.isContributor "gh-nav-contributor"}}" {{did-insert this.updateFirstRender}} ...attributes>
-    {{#if this.ui.contextualNavMenu}}
-        {{component (concat "gh-nav-menu/" this.ui.contextualNavMenu)}}
-    {{else}}
-        <GhNavMenu::Main @icon={{this.settings.settledIcon}} @firstRender={{this.firstRender}} />
-    {{/if}}
+<nav class="gh-nav {{if this.session.user.isContributor "gh-nav-contributor"}}" {{did-insert this.updateFirstRender}} ...attributes>
+    <GhNavMenu::Main @icon={{this.settings.settledIcon}} @firstRender={{this.firstRender}} />
 </nav>
\ No newline at end of file
diff --git a/ghost/admin/app/components/gh-nav-menu/announcement-bar.hbs b/ghost/admin/app/components/gh-nav-menu/announcement-bar.hbs
deleted file mode 100644
index f13e8ff0e6f..00000000000
--- a/ghost/admin/app/components/gh-nav-menu/announcement-bar.hbs
+++ /dev/null
@@ -1,19 +0,0 @@
-<div class="flex flex-column h-100" {{css-transition "gh-nav-contextual"}} data-test-nav-menu="design" ...attributes>
-    <header class="gh-nav-header no-accordion">
-        <LinkTo @route="settings" class="gh-nav-menu-back-button" data-test-link="back-to-settings">Settings</LinkTo>
-        {{svg-jar "arrow-right-small"}} Announcement bar
-    </header>
-    <section class="gh-nav-body gh-nav-design">
-        <div class="gh-nav-top">
-            <div class="gh-nav-list gh-nav-main">
-                <div class="gh-nav-design-settings">
-                    <form>
-                        <AnnouncementSettings::Content @onChange={{this.updatePreview}} />
-                        <AnnouncementSettings::Background @onChange={{this.updatePreview}} />
-                        <AnnouncementSettings::Visibility @onChange={{this.updatePreview}} />
-                    </form>
-                </div>
-            </div>
-        </div>
-    </section>
-</div>
\ No newline at end of file
diff --git a/ghost/admin/app/components/gh-nav-menu/announcement-bar.js b/ghost/admin/app/components/gh-nav-menu/announcement-bar.js
deleted file mode 100644
index ee38935ef7c..00000000000
--- a/ghost/admin/app/components/gh-nav-menu/announcement-bar.js
+++ /dev/null
@@ -1,15 +0,0 @@
-import Component from '@glimmer/component';
-import {action} from '@ember/object';
-import {inject} from 'ghost-admin/decorators/inject';
-import {inject as service} from '@ember/service';
-
-export default class AnnouncementBarMenuComponent extends Component {
-    @service themeManagement;
-
-    @inject config;
-
-    @action
-    updatePreview() {
-        this.themeManagement.updatePreviewHtmlTask.perform();
-    }
-}
diff --git a/ghost/admin/app/components/gh-nav-menu/design.hbs b/ghost/admin/app/components/gh-nav-menu/design.hbs
deleted file mode 100644
index 77db8722b31..00000000000
--- a/ghost/admin/app/components/gh-nav-menu/design.hbs
+++ /dev/null
@@ -1,58 +0,0 @@
-<div class="flex flex-column h-100" {{css-transition "gh-nav-contextual"}} data-test-nav-menu="design" ...attributes>
-    <header class="gh-nav-header">
-        <LinkTo @route="settings" class="gh-nav-menu-back-button" data-test-link="back-to-settings">Settings</LinkTo>
-        {{svg-jar "arrow-right-small"}} Design
-    </header>
-    <section class="gh-nav-body gh-nav-design">
-        <div class="gh-nav-top" {{on "click" this.transitionBackToIndex}}>
-            <div class="gh-nav-list gh-nav-main">
-                <LinkTo @route="settings.design" class="gh-nav-menu-title" @current-when="settings.design.index" {{on "click" this.closeAllSections}}>Site design</LinkTo>
-
-                {{#let (eq this.openSection "brand") as |isOpen|}}
-                    <button class="gh-nav-design-tab {{if isOpen "active"}}" type="button" {{on "click" (fn this.toggleSection "brand")}} data-test-nav-toggle="general">
-                        {{svg-jar "paintbrush"}} Brand
-                        <span class="gh-nav-button-expand">{{svg-jar (if isOpen "arrow-up-stroke" "arrow-down-stroke")}}</span>
-                    </button>
-                    {{#liquid-if isOpen}}
-                        <div class="gh-nav-design-settings" data-test-nav-group="general">
-                            <Settings::Design::GeneralSettingsForm
-                                @didUpdate={{perform this.themeManagement.updatePreviewHtmlTask}}
-                            />
-                        </div>
-                    {{/liquid-if}}
-                {{/let}}
-
-                {{#each this.customThemeSettings.settingGroups as |group|}}
-                    {{#let (eq this.openSection group.key) as |isOpen|}}
-                        <button class="gh-nav-design-tab {{if isOpen "active"}}" type="button" {{on "click" (fn this.toggleSection group.key)}}>
-                            {{svg-jar group.icon}} {{group.name}}
-                            <span class="gh-nav-button-expand">{{svg-jar (if isOpen "arrow-up-stroke" "arrow-down-stroke")}}</span>
-                        </button>
-
-                        {{#liquid-if isOpen}}
-                            <div class="gh-nav-design-settings" data-test-nav-group={{group.key}}>
-                                <Settings::Design::ThemeSettingsForm
-                                    @themeSettings={{group.settings}}
-                                    @onChange={{this.handleThemeSettingChange}}
-                                />
-                            </div>
-                        {{/liquid-if}}
-                    {{/let}}
-                {{/each}}
-            </div>
-        </div>
-
-        <div class="gh-nav-bottom">
-            <div class="gh-change-theme">
-                <div class="gh-nav-design-tab">
-                    <LinkTo @route="settings.design.change-theme" {{on "click" this.closeAllSections}} aria-label="Change theme" data-test-nav="change-theme"></LinkTo>
-                    <div>
-                        <span>Change theme</span>
-                        <span class="active-theme" data-test-text="current-theme">Current: {{this.activeTheme.name}}{{#if this.activeTheme.package.version}} - v{{this.activeTheme.package.version}}{{/if}}{{#if this.activeTheme.package.docs}}<a class="gh-theme-docs" href="{{this.activeTheme.package.docs}}" target="_blank" rel="noopener noreferrer">{{svg-jar "book-open" width="12" height="12"}}</a>{{/if}}</span>
-                    </div>
-                    <div class="gh-nav-design-tabicon">{{svg-jar "sync"}}</div>
-                </div>
-            </div>
-        </div>
-    </section>
-</div>
\ No newline at end of file
diff --git a/ghost/admin/app/components/gh-nav-menu/design.js b/ghost/admin/app/components/gh-nav-menu/design.js
deleted file mode 100644
index bf1d2834a34..00000000000
--- a/ghost/admin/app/components/gh-nav-menu/design.js
+++ /dev/null
@@ -1,92 +0,0 @@
-import Component from '@glimmer/component';
-import {action} from '@ember/object';
-import {bind} from '@ember/runloop';
-import {inject} from 'ghost-admin/decorators/inject';
-import {isEmpty} from '@ember/utils';
-import {inject as service} from '@ember/service';
-import {tracked} from '@glimmer/tracking';
-
-export default class DesignMenuComponent extends Component {
-    @service customThemeSettings;
-    @service router;
-    @service settings;
-    @service store;
-    @service themeManagement;
-
-    @inject config;
-
-    @tracked openSection = null;
-
-    themes = this.store.peekAll('theme');
-
-    constructor() {
-        super(...arguments);
-
-        // fetch all themes in the background so we can show the active theme
-        this.store.findAll('theme');
-
-        if (this.router.currentRouteName === 'settings.design.index') {
-            this.openDefaultSection();
-        }
-
-        this.routeDidChangeHandler = bind(this, this.handleRouteDidChange);
-        this.router.on('routeDidChange', this.routeDidChangeHandler);
-    }
-
-    willDestroy() {
-        super.willDestroy(...arguments);
-        this.router.off('routeDidChange', this.routeDidChangeHandler);
-    }
-
-    get activeTheme() {
-        return this.themes.findBy('active', true);
-    }
-
-    @action
-    toggleSection(section) {
-        if (this.openSection === section) {
-            this.openSection = null;
-        } else {
-            this.openSection = section;
-
-            const group = this.customThemeSettings.KNOWN_GROUPS.findBy('key', section);
-            if (group && group.previewType) {
-                this.themeManagement.setPreviewType(group.previewType);
-            } else {
-                this.themeManagement.setPreviewType('homepage');
-            }
-        }
-    }
-
-    @action
-    transitionBackToIndex() {
-        if (this.router.currentRouteName !== 'settings.design.index') {
-            this.router.transitionTo('settings.design.index');
-        }
-    }
-
-    @action
-    closeAllSections() {
-        this.openSection = null;
-    }
-
-    @action
-    handleThemeSettingChange() {
-        this.customThemeSettings.updateSettingsVisibility();
-        this.themeManagement.updatePreviewHtmlTask.perform();
-    }
-
-    openDefaultSection() {
-        const noCustomSettings = isEmpty(this.customThemeSettings.settings);
-
-        if (noCustomSettings) {
-            this.openSection = 'brand';
-        }
-    }
-
-    handleRouteDidChange(transition) {
-        if (!transition.isAborted && transition.to?.name === 'settings.design.index') {
-            this.openDefaultSection();
-        }
-    }
-}
diff --git a/ghost/admin/app/components/gh-post-settings-menu.hbs b/ghost/admin/app/components/gh-post-settings-menu.hbs
index 90b0abab3df..24272c8ad68 100644
--- a/ghost/admin/app/components/gh-post-settings-menu.hbs
+++ b/ghost/admin/app/components/gh-post-settings-menu.hbs
@@ -427,6 +427,14 @@
                                             <span class="gh-key" data-tooltip="Return">&#8617;</span>
                                         </div>
                                     </div>
+                                    {{#if (feature "editorEmojiPicker")}}
+                                        <div class="gh-shortcut">
+                                            <div>Emoji</div>
+                                            <div class="gh-keys">
+                                                <span class="gh-key mono">:emoji_name:</span>
+                                            </div>
+                                        </div>
+                                    {{/if}}
                                     <div class="gh-shortcut">
                                         <div>Image</div>
                                         <div class="gh-keys">
diff --git a/ghost/admin/app/components/gh-role-selection.hbs b/ghost/admin/app/components/gh-role-selection.hbs
deleted file mode 100644
index 0fb8edfdbde..00000000000
--- a/ghost/admin/app/components/gh-role-selection.hbs
+++ /dev/null
@@ -1,157 +0,0 @@
-<div class="gh-roles-container" {{did-insert (perform this.fetchRolesTask)}}>
-    {{#if this.fetchRolesTask.isRunning}}
-        {{!-- width and height are needed to avoid layout shift after roles have loaded --}}
-        <div style="width: 486px; height: 268px">
-            <GhLoadingSpinner />
-        </div>
-    {{else}}
-        <div class="gh-radio {{if (eq @selected.name "Contributor") "active"}}" {{on "click" (fn this.setRole "Contributor")}} data-test-option="Contributor">
-            <div class="gh-radio-button"></div>
-            <div class="gh-radio-content">
-                <div class="gh-radio-label">Contributor</div>
-                <div class="gh-radio-desc">Can create and edit their own posts, but cannot publish. An Editor needs to approve and publish for them.</div>
-            </div>
-            <div>
-                {{!-- Inner container collapses height to the SVG so popover can align correctly --}}
-                <div>
-                    {{svg-jar "info"}}
-                    <EmberPopover @tooltipClass="popover" @arrowClass="popover-arrow" @side="left">
-                        <table>
-                            <tbody>
-                                <tr>
-                                    <td class="left">Settings</td>
-                                    <td>View and edit own profile</td>
-                                </tr>
-                                <tr>
-                                    <td class="left">Posts</td>
-                                    <td>Create and edit own draft posts</td>
-                                </tr>
-                            </tbody>
-                        </table>
-                    </EmberPopover>
-                </div>
-            </div>
-        </div>
-
-        <div class="gh-radio {{if (eq @selected.name "Author") "active"}}" {{on "click" (fn this.setRole "Author")}} data-test-option="Author">
-            <div class="gh-radio-button"></div>
-            <div class="gh-radio-content">
-                <div class="gh-radio-label">Author</div>
-                <div class="gh-radio-desc">A trusted user who can create, edit and publish their own posts, but can’t modify others.</div>
-            </div>
-            <div>
-                {{!-- Inner container collapses height to the SVG so popover can align correctly --}}
-                <div>
-                    {{svg-jar "info"}}
-                    <EmberPopover @tooltipClass="popover" @arrowClass="popover-arrow" @side="left">
-                        <table>
-                            <tbody>
-                                <tr>
-                                    <td class="left">Settings</td>
-                                    <td>View and edit own profile</td>
-                                </tr>
-                                <tr>
-                                    <td class="left">Users</td>
-                                    <td>Browse users</td>
-                                </tr>
-                                <tr>
-                                    <td class="left">Posts</td>
-                                    <td>View, edit and publish own posts, generate slugs</td>
-                                </tr>
-                                <tr>
-                                    <td class="left">Tags</td>
-                                    <td>Add tags</td>
-                                </tr>
-                            </tbody>
-                        </table>
-                    </EmberPopover>
-                </div>
-            </div>
-        </div>
-
-        <div class="gh-radio {{if (eq @selected.name "Editor") "active"}}" {{on "click" (fn this.setRole "Editor")}} data-test-option="Editor">
-            <div class="gh-radio-button"></div>
-            <div class="gh-radio-content">
-                <div class="gh-radio-label">Editor</div>
-                <div class="gh-radio-desc">Can invite and manage other Authors and Contributors, as well as edit and publish any posts on the site.</div>
-            </div>
-            <div>
-                {{!-- Inner container collapses height to the SVG so popover can align correctly --}}
-                <div>
-                    {{svg-jar "info"}}
-                    <EmberPopover @tooltipClass="popover" @arrowClass="popover-arrow" @side="left">
-                        <table>
-                            <tbody>
-                                <tr>
-                                    <td class="left">Settings</td>
-                                    <td>View and edit own profile</td>
-                                </tr>
-                                <tr>
-                                    <td class="left">Users</td>
-                                    <td>Browse users, manage authors and contributors (invite, revoke, delete)</td>
-                                </tr>
-                                <tr>
-                                    <td class="left">Posts</td>
-                                    <td>Create, publish, edit and delete all posts, generate slugs</td>
-                                </tr>
-                                <tr>
-                                    <td class="left">Tags</td>
-                                    <td>Edit, add and delete tags</td>
-                                </tr>
-                            </tbody>
-                        </table>
-                    </EmberPopover>
-                </div>
-            </div>
-        </div>
-
-        <div class="gh-radio {{if (eq @selected.name "Administrator") "active"}}" {{on "click" (fn this.setRole "Administrator")}} data-test-option="Administrator">
-            <div class="gh-radio-button"></div>
-            <div class="gh-radio-content">
-                <div class="gh-radio-label">Administrator</div>
-                <div class="gh-radio-desc">Trusted staff user who should be able to manage all content and users, as well as site settings and options.</div>
-            </div>
-            <div>
-                {{!-- Inner container collapses height to the SVG so popover can align correctly --}}
-                <div>
-                    {{svg-jar "info"}}
-                    <EmberPopover @tooltipClass="popover" @arrowClass="popover-arrow" @side="left">
-                        <table>
-                            <tbody>
-                                <tr>
-                                    <td class="left">Settings</td>
-                                    <td>Access all except Stripe settings</td>
-                                </tr>
-                                <tr>
-                                    <td class="left">Users</td>
-                                    <td>Manage all users (invite, revoke, delete)</td>
-                                </tr>
-                                <tr>
-                                    <td class="left">Posts</td>
-                                    <td>Create, publish, edit and delete all posts, generate slugs</td>
-                                </tr>
-                                <tr>
-                                    <td class="left">Tags</td>
-                                    <td>Edit, add and delete tags</td>
-                                </tr>
-                                <tr>
-                                    <td class="left">Database</td>
-                                    <td>Import, export and delete all content</td>
-                                </tr>
-                                <tr>
-                                    <td class="left">Email</td>
-                                    <td>Send newsletters and test emails</td>
-                                </tr>
-                            </tbody>
-                        </table>
-                    </EmberPopover>
-                </div>
-            </div>
-        </div>
-
-
-        <div class="gh-content-box pa" hidden={{if this.limitErrorMessage false true}}>
-            {{html-safe this.limitErrorMessage}} To use selected user role, upgrade to a different plan.
-        </div>
-    {{/if}}
-</div>
\ No newline at end of file
diff --git a/ghost/admin/app/components/gh-role-selection.js b/ghost/admin/app/components/gh-role-selection.js
deleted file mode 100644
index d64fa46bf18..00000000000
--- a/ghost/admin/app/components/gh-role-selection.js
+++ /dev/null
@@ -1,62 +0,0 @@
-import Component from '@glimmer/component';
-import {action} from '@ember/object';
-import {inject as service} from '@ember/service';
-import {task} from 'ember-concurrency';
-import {tracked} from '@glimmer/tracking';
-
-const DEFAULT_ROLE_NAME = 'Contributor';
-
-export default class GhRoleSelectionComponent extends Component {
-    @service limit;
-    @service notifications;
-    @service store;
-
-    @tracked roles = [];
-    @tracked limitErrorMessage = null;
-
-    @action
-    async setRole(roleName) {
-        const role = this.roles.findBy('name', roleName);
-        this.args.setRole(role);
-        return this.validateRole(role);
-    }
-
-    @task
-    *fetchRolesTask() {
-        const roles = yield this.store.query('role', {permissions: 'assign'});
-        const defaultRole = roles.findBy('name', DEFAULT_ROLE_NAME);
-
-        this.roles = roles;
-
-        if (!this.args.selected && defaultRole) {
-            this.args.setRole(defaultRole);
-        }
-    }
-
-    async validateRole(role) {
-        if (role.name === 'Contributor') {
-            this.args.onValidationSuccess?.();
-        }
-
-        if (role.name !== 'Contributor'
-            && this.limit.limiter
-            && this.limit.limiter.isLimited('staff')
-        ) {
-            try {
-                await this.limit.limiter.errorIfWouldGoOverLimit('staff');
-
-                this.limitErrorMessage = null;
-                this.args.onValidationSuccess?.();
-            } catch (error) {
-                if (error.errorType === 'HostLimitError') {
-                    this.limitErrorMessage = error.message;
-                    this.args.onValidationFailure?.(this.limitErrorMessage);
-                } else {
-                    this.notifications.showAPIError(error, {key: 'staff.limit'});
-                }
-            }
-        } else {
-            this.limitErrorMessage = null;
-        }
-    }
-}
diff --git a/ghost/admin/app/components/gh-theme-table.hbs b/ghost/admin/app/components/gh-theme-table.hbs
deleted file mode 100644
index edd953c6c07..00000000000
--- a/ghost/admin/app/components/gh-theme-table.hbs
+++ /dev/null
@@ -1,32 +0,0 @@
-<div class="apps-grid" data-test-themes-list>
-    {{#each this.sortedThemes as |theme index|}}
-        <div class="apps-grid-cell" data-test-theme-id="{{theme.name}}" data-test-theme-active="{{theme.active}}">
-            <div class="apps-card-app {{if theme.active "theme-list-item--active"}}">
-                <div class="apps-card-meta flex-grow-1">
-                    <h3 class="apps-card-app-title" data-test-theme-title>
-                        {{theme.label}}
-                        {{#if theme.active}}<span class="gh-badge gh-badge-green">Active</span>{{/if}}
-                    </h3>
-                    <p class="apps-card-app-desc" data-test-theme-description><span class="description">Version {{theme.version}}</span></p>
-                </div>
-                {{#unless theme.active}}
-                    <button type="button" {{on "click" (fn this.activateTheme theme.model this.dd)}} class="apps-configured-action darkgrey apps-configured-action-activate green-hover green-bg-hover" data-test-button="activate">Activate</button>
-                {{/unless}}
-                <GhBasicDropdown @verticalPosition="below" @horizontalPosition="right" @buttonPosition="right" as |dd|>
-                    <dd.Trigger class="gh-btn gh-btn-icon fill" data-test-button="actions"><span>{{svg-jar "dotdotdot"}}</span></dd.Trigger>
-
-                    <dd.Content class="relative-dropdown-menu">
-                        <ul class="dropdown-menu" data-test-actions-for={{theme.name}}>
-
-                            <li><button type="button" {{on "click" (fn this.downloadTheme theme.name dd)}} class="darkgrey darkgrey-hover lightgrey-bg-hover" data-test-button="download">Download</button></li>
-
-                            {{#if theme.isDeletable}}
-                                <li><button type="button" {{on "click" (fn this.deleteTheme theme.model dd)}} disabled={{theme.active}} class="gh-list-delete" data-test-button="delete">Delete</button></li>
-                            {{/if}}
-                        </ul>
-                    </dd.Content>
-                </GhBasicDropdown>
-            </div>
-        </div>
-    {{/each}}
-</div>
diff --git a/ghost/admin/app/components/gh-theme-table.js b/ghost/admin/app/components/gh-theme-table.js
deleted file mode 100644
index 8cc250749fe..00000000000
--- a/ghost/admin/app/components/gh-theme-table.js
+++ /dev/null
@@ -1,111 +0,0 @@
-import Component from '@glimmer/component';
-import ConfirmDeleteThemeModal from './modals/design/confirm-delete-theme';
-import {action, get} from '@ember/object';
-import {inject as service} from '@ember/service';
-
-export default class GhThemeTableComponent extends Component {
-    @service ghostPaths;
-    @service modals;
-    @service themeManagement;
-    @service utils;
-
-    activateTaskInstance = null;
-    confirmDeleteModal = null;
-
-    willDestroy() {
-        super.willDestroy(...arguments);
-        this.confirmDeleteModal?.close?.();
-        this.activateTaskInstance?.cancel();
-    }
-
-    isDefaultTheme(theme) {
-        return theme.name.toLowerCase() === 'source';
-    }
-
-    isLegacyTheme(theme) {
-        return theme.name.toLowerCase() === 'casper';
-    }
-
-    get sortedThemes() {
-        let themes = this.args.themes.map((t) => {
-            let theme = {};
-            let themePackage = get(t, 'package');
-
-            theme.model = t;
-            theme.name = get(t, 'name');
-            theme.label = themePackage ? `${themePackage.name}` : theme.name;
-            theme.version = themePackage ? `${themePackage.version}` : '1.0';
-            theme.package = themePackage;
-            theme.active = get(t, 'active');
-            theme.isDeletable = !theme.active;
-            return theme;
-        });
-        let duplicateThemes = [];
-
-        themes.forEach((theme) => {
-            let duplicateLabels = themes.filterBy('label', theme.label);
-
-            if (duplicateLabels.length > 1) {
-                duplicateThemes.pushObject(theme);
-            }
-        });
-
-        duplicateThemes.forEach((theme) => {
-            if (!this.isDefaultTheme(theme) && !this.isLegacyTheme(theme)) {
-                theme.label = `${theme.label} (${theme.name})`;
-            }
-        });
-
-        // add (default) or (legacy) as appropriate and prevent deletion of default/legacy themes
-        // this needs to be after deduplicating by label
-        themes.filter(this.isDefaultTheme).forEach((theme) => {
-            theme.label = `${theme.label} (default)`;
-            theme.isDefault = true;
-            theme.isDeletable = false;
-        });
-
-        themes.filter(this.isLegacyTheme).forEach((theme) => {
-            theme.label = `${theme.label} (legacy)`;
-            theme.isLegacy = true;
-            theme.isDeletable = false;
-        });
-
-        // sorting manually because .sortBy('label') has a different sorting
-        // algorithm to [...strings].sort()
-        return themes.sort((themeA, themeB) => {
-            let a = themeA.label.toLowerCase();
-            let b = themeB.label.toLowerCase();
-
-            if (a < b) {
-                return -1;
-            }
-            if (a > b) {
-                return 1;
-            }
-            return 0;
-        });
-    }
-
-    @action
-    downloadTheme(themeName, dropdown) {
-        dropdown?.actions.close();
-        this.utils.downloadFile(`${this.ghostPaths.apiRoot}/themes/${themeName}/download/`);
-    }
-
-    @action
-    activateTheme(theme, dropdown) {
-        dropdown?.actions.close();
-        this.activateTaskInstance = this.themeManagement.activateTask.perform(theme);
-    }
-
-    @action
-    deleteTheme(theme, dropdown) {
-        dropdown?.actions.close();
-
-        this.confirmDeleteModal = this.modals.open(ConfirmDeleteThemeModal, {
-            theme
-        }).finally(() => {
-            this.confirmDeleteModal = null;
-        });
-    }
-}
diff --git a/ghost/admin/app/components/gh-tier-card.hbs b/ghost/admin/app/components/gh-tier-card.hbs
deleted file mode 100644
index 82d69084cc2..00000000000
--- a/ghost/admin/app/components/gh-tier-card.hbs
+++ /dev/null
@@ -1,110 +0,0 @@
-<div class="gh-main-content-card gh-tier-card" data-test-tier-card={{@tier.slug}}>
-    <div class="gh-tier-card-block title-block">
-        <h3 class="gh-tier-card-name" data-test-name>
-            {{@tier.name}}
-        </h3>
-        <p class="gh-tier-card-description" data-test-description>
-        {{#if @tier.description.length}}
-            {{@tier.description}}
-        {{else}}
-            No description added for this tier.
-        {{/if}}
-        </p>
-    </div>
-    <div class="gh-tier-card-block benefits-block" data-test-benefits>
-        <h4>Benefits <span class="counter">({{or @tier.benefits.length "0"}})</span></h4>
-        {{#if @tier.benefits.length}}
-            <ul class="benefits">
-                {{#each @tier.benefits as |benefit|}}
-                    <li>{{svg-jar "check"}} {{benefit.name}} </li>
-                {{/each}}
-            </ul>
-        {{else}}
-            <p class="gh-tier-card-description">No benefits added for this tier.</p>
-        {{/if}}
-    </div>
-    {{#if (eq @tier.type "free" )}}
-        <div class="gh-tier-card-block">
-            <div class="gh-tier-price-container">
-                <div class="gh-tier-card-price" data-test-free-price>
-                    <div class="flex items-start">
-                        <span class="currency">{{currency-symbol this.tierCurrency}}</span>
-                        <span class="amount">0</span>
-                    </div>
-                </div>
-            </div>
-        </div>
-    {{/if}}
-    {{#if (eq @tier.type "paid" )}}
-        <div class="gh-tier-card-block price-block">
-            <div class="gh-tier-price-container">
-                <div class="gh-tier-price-cards">
-                    <div class="gh-tier-card-price" data-test-monthly-price>
-                        <div class="flex items-start">
-                            <span class="currency">{{currency-symbol this.tierCurrency}}</span>
-                            <span class="amount" data-test-amount-monthly-price>{{gh-price-amount @tier.monthlyPrice}}</span>
-                        </div>
-                        <div class="period">Monthly</div>
-                    </div>
-                    <div class="gh-tier-card-price" data-test-yearly-price>
-                        <div class="flex items-start">
-                            <span class="currency">{{currency-symbol this.tierCurrency}}</span>
-                            <span class="amount" data-test-amount-yearly-price>{{gh-price-amount @tier.yearlyPrice}}</span>
-                        </div>
-                        <div class="period">Yearly</div>
-                    </div>
-                </div>
-                {{#if this.isFreeTrialEnabled}}
-                <div class="gh-tier-free-trial-label">
-                    <span class="gh-tier-free-trial-days">{{this.tierTrialDays}} day</span> free trial
-                </div>
-                {{/if}}
-            </div>
-        </div>
-    {{/if}}
-    {{#if (eq @tier.type "paid" )}}
-    <div class="gh-tier-card-button-container">
-        <span class="dropdown">
-            <GhDropdownButton
-                @dropdownName="tiers-actions-menu-{{@tier.name}}"
-                @classNames="gh-btn gh-btn-action-icon gh-btn-icon fill gh-btn-outline gh-tier-card-actions-button icon-only"
-                @title="Tiers Actions"
-                data-test-button="tiers-actions"
-            >
-                <span>
-                    {{svg-jar "dotdotdot"}}
-                    <span class="hidden">Actions</span>
-                </span>
-            </GhDropdownButton>
-                <GhDropdown
-                    @name="tiers-actions-menu-{{@tier.name}}"
-                    @tagName="ul"
-                    @classNames="gh-tier-actions-menu dropdown-menu dropdown-triangle-top-right"
-                >
-                    <li>
-                        <button class="mr2" type="button" data-test-button="edit-tier" {{on "click" (fn this.openEditTier @tier)}}>
-                            <span>Edit</span>
-                        </button>
-                    </li>
-                    {{#if this.showArchiveOption}}
-                        <li>
-                            <Settings::Members::ArchiveTier
-                                @tier={{@tier}}
-                                @onUnarchive={{@onUnarchive}}
-                                @onArchive={{@onArchive}}
-                            />
-                        </li>
-                    {{/if}}
-                </GhDropdown>
-        </span>
-    </div>
-    {{else}}
-    <div class="gh-tier-card-button-container">
-        <button type="button" {{on "click" (fn this.openEditTier @tier)}} class="gh-btn gh-btn-action-icon gh-btn-icon gh-btn-outline gh-tier-card-edit-button icon-only" data-test-button="edit-tier">
-            <span>
-                {{svg-jar "pen"}}
-            </span>
-        </button>
-    </div>
-    {{/if}}
-</div>
diff --git a/ghost/admin/app/components/gh-tier-card.js b/ghost/admin/app/components/gh-tier-card.js
deleted file mode 100644
index 2bee53186d8..00000000000
--- a/ghost/admin/app/components/gh-tier-card.js
+++ /dev/null
@@ -1,62 +0,0 @@
-import Component from '@glimmer/component';
-import {action} from '@ember/object';
-import {getSymbol} from 'ghost-admin/utils/currency';
-import {inject} from 'ghost-admin/decorators/inject';
-import {inject as service} from '@ember/service';
-import {tracked} from '@glimmer/tracking';
-
-export default class extends Component {
-    @service membersUtils;
-    @service ghostPaths;
-    @service ajax;
-    @service store;
-
-    @inject config;
-
-    @tracked showTierModal = false;
-
-    get tier() {
-        return this.args.tier;
-    }
-
-    get showArchiveOption() {
-        return this.tier.type === 'paid' && !!this.tier.monthlyPrice;
-    }
-
-    get tierCurrency() {
-        if (this.isFreeTier) {
-            const firstPaidTier = this.args.tiers.find((tier) => {
-                return tier.type === 'paid';
-            });
-            return firstPaidTier?.currency || 'usd';
-        } else {
-            return this.tier?.currency;
-        }
-    }
-
-    get isPaidTier() {
-        return this.tier.type === 'paid';
-    }
-
-    get hasCurrencySymbol() {
-        const currencySymbol = getSymbol(this.tier?.monthlyPrice?.currency);
-        return currencySymbol?.length !== 3;
-    }
-
-    get isFreeTier() {
-        return this.tier.type === 'free';
-    }
-
-    get isFreeTrialEnabled() {
-        return this.tier.trialDays > 0;
-    }
-
-    get tierTrialDays() {
-        return this.tier.trialDays;
-    }
-
-    @action
-    async openEditTier(tier) {
-        this.args.openEditTier(tier);
-    }
-}
diff --git a/ghost/admin/app/components/gh-tiers-price-billingperiod.hbs b/ghost/admin/app/components/gh-tiers-price-billingperiod.hbs
deleted file mode 100644
index a35b18eab7c..00000000000
--- a/ghost/admin/app/components/gh-tiers-price-billingperiod.hbs
+++ /dev/null
@@ -1,15 +0,0 @@
-<span class="gh-select">
-    <OneWaySelect
-        @value={{this.value}}
-        @disabled={{this.disabled}}
-        @options={{this.availablePeriods}}
-        @optionValuePath="period"
-        @optionLabelPath="label"
-        @optionTargetPath="period"
-        @includeBlank={{false}}
-        @promptIsSelectable={{false}}
-        @prompt="Select a billing period"
-        @update={{action "updatePeriod"}}
-    />
-    {{svg-jar "arrow-down-small"}}
-</span>
\ No newline at end of file
diff --git a/ghost/admin/app/components/gh-tiers-price-billingperiod.js b/ghost/admin/app/components/gh-tiers-price-billingperiod.js
deleted file mode 100644
index c59ea4ce084..00000000000
--- a/ghost/admin/app/components/gh-tiers-price-billingperiod.js
+++ /dev/null
@@ -1,35 +0,0 @@
-import Component from '@glimmer/component';
-import {action} from '@ember/object';
-import {inject as service} from '@ember/service';
-
-const PERIODS = [
-    {label: 'Monthly', period: 'month'},
-    {label: 'Yearly', period: 'year'}
-];
-
-export default class GhTiersPriceBillingPeriodComponent extends Component {
-    @service feature;
-    @service session;
-    @service settings;
-
-    constructor() {
-        super(...arguments);
-        this.availablePeriods = PERIODS;
-    }
-
-    get value() {
-        const {value} = this.args;
-        return value;
-    }
-    get disabled() {
-        const {disabled} = this.args;
-        return disabled || false;
-    }
-
-    @action
-    updatePeriod(newPeriod) {
-        if (this.args.updatePeriod) {
-            this.args.updatePeriod(this.args.value, newPeriod);
-        }
-    }
-}
diff --git a/ghost/admin/app/components/gh-timezone-select.hbs b/ghost/admin/app/components/gh-timezone-select.hbs
deleted file mode 100644
index 84dbc10f2a4..00000000000
--- a/ghost/admin/app/components/gh-timezone-select.hbs
+++ /dev/null
@@ -1,16 +0,0 @@
-<span class="gh-select" data-select-text="{{this.selectedTimezone.label}}" tabindex="0">
-    <OneWaySelect
-        @id="timezone"
-        @name="general[timezone]"
-        @options={{this.selectableTimezones}}
-        @optionValuePath="name"
-        @optionLabelPath="label"
-        @value={{this.selectedTimezone}}
-        @update={{action "setTimezone"}}
-    />
-    {{svg-jar "arrow-down-small"}}
-</span>
-{{#if this.hasTimezoneOverride}}
-    <p>Your timezone has been automatically set to {{this.timezone}}.</p>
-{{/if}}
-<p>The local time here is currently {{this.localTime}}</p>
diff --git a/ghost/admin/app/components/gh-timezone-select.js b/ghost/admin/app/components/gh-timezone-select.js
deleted file mode 100644
index 4881ed34e9e..00000000000
--- a/ghost/admin/app/components/gh-timezone-select.js
+++ /dev/null
@@ -1,71 +0,0 @@
-import Component from '@ember/component';
-import classic from 'ember-classic-decorator';
-import moment from 'moment-timezone';
-import {action, computed} from '@ember/object';
-import {classNames} from '@ember-decorators/component';
-import {mapBy} from '@ember/object/computed';
-import {inject as service} from '@ember/service';
-
-@classic
-@classNames('form-group', 'for-select')
-export default class GhTimezoneSelect extends Component {
-    @service clock;
-
-    timezone = null;
-    availableTimezones = null;
-
-    // Allowed actions
-    update = () => {};
-
-    @mapBy('availableTimezones', 'name')
-        availableTimezoneNames;
-
-    @computed('timezone', 'availableTimezoneNames')
-    get hasTimezoneOverride() {
-        let timezone = this.timezone;
-        let availableTimezoneNames = this.availableTimezoneNames;
-
-        return !availableTimezoneNames.includes(timezone);
-    }
-
-    @computed('timezone', 'availableTimezones', 'hasTimezoneOverride')
-    get selectedTimezone() {
-        let hasTimezoneOverride = this.hasTimezoneOverride;
-        let timezone = this.timezone;
-        let availableTimezones = this.availableTimezones;
-
-        if (hasTimezoneOverride) {
-            return {name: '', label: ''};
-        }
-
-        return availableTimezones
-            .filterBy('name', timezone)
-            .get('firstObject');
-    }
-
-    @computed('availableTimezones', 'hasTimezoneOverride')
-    get selectableTimezones() {
-        let hasTimezoneOverride = this.hasTimezoneOverride;
-        let availableTimezones = this.availableTimezones;
-
-        if (hasTimezoneOverride) {
-            return [{name: '', label: ''}, ...availableTimezones];
-        }
-
-        return availableTimezones;
-    }
-
-    @computed('hasTimezoneOverride', 'timezone', 'selectedTimezone', 'clock.second')
-    get localTime() {
-        let hasTimezoneOverride = this.hasTimezoneOverride;
-        let timezone = hasTimezoneOverride ? this.timezone : this.get('selectedTimezone.name');
-
-        this.get('clock.second');
-        return timezone ? moment().tz(timezone).format('HH:mm:ss') : moment().utc().format('HH:mm:ss');
-    }
-
-    @action
-    setTimezone(timezone) {
-        this.update(timezone);
-    }
-}
diff --git a/ghost/admin/app/components/gh-user-active.hbs b/ghost/admin/app/components/gh-user-active.hbs
deleted file mode 100644
index f4a0b59217a..00000000000
--- a/ghost/admin/app/components/gh-user-active.hbs
+++ /dev/null
@@ -1 +0,0 @@
-{{yield this}}
diff --git a/ghost/admin/app/components/gh-user-active.js b/ghost/admin/app/components/gh-user-active.js
deleted file mode 100644
index 27f18cfb544..00000000000
--- a/ghost/admin/app/components/gh-user-active.js
+++ /dev/null
@@ -1,18 +0,0 @@
-import Component from '@ember/component';
-import classic from 'ember-classic-decorator';
-import moment from 'moment-timezone';
-import {computed} from '@ember/object';
-import {tagName} from '@ember-decorators/component';
-
-@classic
-@tagName('')
-export default class GhUserActive extends Component {
-    user = null;
-
-    @computed('user.lastLoginUTC')
-    get lastLoginUTC() {
-        let lastLoginUTC = this.get('user.lastLoginUTC');
-
-        return lastLoginUTC ? moment(lastLoginUTC).fromNow() : '(Never)';
-    }
-}
diff --git a/ghost/admin/app/components/gh-user-invited.hbs b/ghost/admin/app/components/gh-user-invited.hbs
deleted file mode 100644
index f4a0b59217a..00000000000
--- a/ghost/admin/app/components/gh-user-invited.hbs
+++ /dev/null
@@ -1 +0,0 @@
-{{yield this}}
diff --git a/ghost/admin/app/components/gh-user-invited.js b/ghost/admin/app/components/gh-user-invited.js
deleted file mode 100644
index 795750f8750..00000000000
--- a/ghost/admin/app/components/gh-user-invited.js
+++ /dev/null
@@ -1,84 +0,0 @@
-import Component from '@glimmer/component';
-import moment from 'moment-timezone';
-import {action} from '@ember/object';
-import {isNotFoundError} from 'ember-ajax/errors';
-import {inject as service} from '@ember/service';
-import {tracked} from '@glimmer/tracking';
-
-export default class GhUserInvited extends Component {
-    @service notifications;
-    @service store;
-
-    @tracked isSending = false;
-
-    get createdAt() {
-        const createdAtUTC = this.args.invite.createdAtUTC;
-        return createdAtUTC ? moment(createdAtUTC).fromNow() : '';
-    }
-
-    get expiresAt() {
-        const expires = this.args.invite.expires;
-        return expires ? moment(expires).fromNow() : '';
-    }
-
-    get isExpired() {
-        const expires = this.args.invite.expires;
-        const now = (new Date()).valueOf();
-        return expires < now;
-    }
-
-    @action
-    resend(event) {
-        event?.preventDefault();
-
-        const invite = this.args.invite;
-        const notifications = this.notifications;
-
-        this.isSending = true;
-        invite.resend().then((result) => {
-            const notificationText = `Invitation resent! (${invite.email})`;
-
-            // the server deletes the old record and creates a new one when
-            // resending so we need to update the store accordingly
-            invite.unloadRecord();
-            this.store.pushPayload('invite', result);
-
-            // If sending the invitation email fails, the API will still return a status of 201
-            // but the invite's status in the response object will be 'invited-pending'.
-            if (result.invites[0].status === 'invited-pending') {
-                notifications.showAlert('Invitation email was not sent.  Please try resending.', {type: 'error', key: 'invite.resend.not-sent'});
-            } else {
-                notifications.showNotification(notificationText, {icon: 'send-email', key: 'invite.resend.success'});
-            }
-        }).catch((error) => {
-            notifications.showAPIError(error, {key: 'invite.resend'});
-        }).finally(() => {
-            this.isSending = false;
-        });
-    }
-
-    @action
-    revoke(event) {
-        event?.preventDefault();
-
-        const invite = this.args.invite;
-        const email = invite.email;
-        const notifications = this.notifications;
-
-        // reload the invite to get the most up-to-date information
-        invite.reload().then(() => {
-            invite.destroyRecord().then(() => {
-                notifications.showNotification('Invitation revoked', {key: 'invite.revoke.success', description: `${email}`});
-            }).catch((error) => {
-                notifications.showAPIError(error, {key: 'invite.revoke'});
-            });
-        }).catch((error) => {
-            if (isNotFoundError(error)) {
-                this.args.reload?.();
-                notifications.showAlert('This invite has been revoked or a user has already accepted the invitation.', {type: 'error', delayed: true, key: 'invite.revoke.already-accepted'});
-            } else {
-                throw error;
-            }
-        });
-    }
-}
diff --git a/ghost/admin/app/components/gh-user-list-item.hbs b/ghost/admin/app/components/gh-user-list-item.hbs
deleted file mode 100644
index aedfd991f05..00000000000
--- a/ghost/admin/app/components/gh-user-list-item.hbs
+++ /dev/null
@@ -1,32 +0,0 @@
-<div class="apps-grid-cell tooltip-centered {{if (and this.user.isAdmin this.session.user.isEditor) 'user-list-item-no-interaction'}}" data-tooltip="{{ if this.user.isLocked 'Requires password reset to log in'}}">
-    <LinkTo @route="settings.staff.user" @model={{this.user.slug}} @disabled={{and this.user.isAdmin this.session.user.isEditor}} data-test-user-id={{this.user.id}}>
-    <article class="apps-card-app">
-        <div class="apps-card-left">
-            <span class="user-list-item-figure" style={{background-image-style this.user.profileImageUrl}}>
-                <span class="hidden">Photo of {{this.user.name}}</span>
-            </span>
-            <div class="apps-card-meta">
-                <h3 class="apps-card-app-title">{{this.user.name}}</h3>
-                <p class="apps-card-app-desc">Last seen: {{this.component.lastLoginUTC}}</p>
-            </div>
-        </div>
-        <div class="apps-card-right">
-            {{#if this.user.isLocked}}
-                <span class="gh-badge locked">{{svg-jar "lock"}}</span>
-            {{/if}}
-            <div class="apps-configured">
-                {{#if this.user.isSuspended}}
-                    <span class="gh-badge suspended">Suspended</span>
-                {{else}}
-                    {{#unless this.session.user.isAuthorOrContributor}}
-                        {{#each this.user.roles as |role|}}
-                            <span class="gh-badge {{role.lowerCaseName}}" data-test-role-name>{{role.name}}</span>
-                        {{/each}}
-                    {{/unless}}
-                {{/if}}
-                {{svg-jar "arrow-right" class="gh-user-arrow-icon"}}
-            </div>
-        </div>
-    </article>
-    </LinkTo>
-</div>
diff --git a/ghost/admin/app/components/gh-user-list-item.js b/ghost/admin/app/components/gh-user-list-item.js
deleted file mode 100644
index e2abad08f99..00000000000
--- a/ghost/admin/app/components/gh-user-list-item.js
+++ /dev/null
@@ -1,10 +0,0 @@
-import Component from '@ember/component';
-import classic from 'ember-classic-decorator';
-import {inject as service} from '@ember/service';
-import {tagName} from '@ember-decorators/component';
-
-@classic
-@tagName('')
-export default class GhUserListItem extends Component {
-    @service session;
-}
diff --git a/ghost/admin/app/components/koenig-lexical-editor-input.js b/ghost/admin/app/components/koenig-lexical-editor-input.js
index f33d6985afb..950859846c3 100644
--- a/ghost/admin/app/components/koenig-lexical-editor-input.js
+++ b/ghost/admin/app/components/koenig-lexical-editor-input.js
@@ -40,6 +40,11 @@ const HtmlOutputPlugin = ({editorResource, ...props}) => {
     return <_HtmlOutputPlugin {...props} />;
 };
 
+const EmojiPickerPlugin = ({editorResource, ...props}) => {
+    const {EmojiPickerPlugin: _EmojiPickerPlugin} = editorResource.read();
+    return <_EmojiPickerPlugin {...props} />;
+};
+
 export default class KoenigLexicalEditorInput extends Component {
     @service ajax;
     @service feature;
@@ -50,6 +55,14 @@ export default class KoenigLexicalEditorInput extends Component {
 
     editorResource = this.koenig.resource;
 
+    get emojiPicker() {
+        if (!this.feature.editorEmojiPicker) {
+            return false;
+        }
+
+        return this.args.emojiPicker ?? true;
+    }
+
     @action
     onError(error) {
         // ensure we're still showing errors in development
@@ -89,6 +102,7 @@ export default class KoenigLexicalEditorInput extends Component {
                                 placeholderClassName="koenig-lexical-editor-input-placeholder"
                             >
                                 <HtmlOutputPlugin editorResource={this.editorResource} html={props.html} setHtml={props.onChangeHtml} />
+                                {this.emojiPicker ? <EmojiPickerPlugin editorResource={this.editorResource} /> : null}
                             </KoenigComposableEditor>
                         </KoenigComposer>
                     </Suspense>
diff --git a/ghost/admin/app/components/modal-disconnect-stripe.hbs b/ghost/admin/app/components/modal-disconnect-stripe.hbs
deleted file mode 100644
index 0febae1aceb..00000000000
--- a/ghost/admin/app/components/modal-disconnect-stripe.hbs
+++ /dev/null
@@ -1,17 +0,0 @@
-<header class="modal-header">
-    <h1>Are you sure you want to disconnect?</h1>
-</header>
-<a class="close" href="" role="button" title="Close" {{action "closeModal"}}>{{svg-jar "close"}}<span class="hidden">Close</span></a>
-
-<div class="modal-body">
-    You're about to disconnect your Stripe account 
-    {{#if this.stripeConnectAccountName}}
-        ({{this.stripeConnectAccountName}}) 
-    {{/if}}
-    from this site. This will automatically turn off paid memberships on this site.
-</div>
-
-<div class="modal-footer">
-    <button class="gh-btn" type="button" {{action "closeModal"}}><span>Cancel</span></button>
-    <GhTaskButton @buttonText="Disconnect" @successText="Disconnected" @task={{this.disconnectStripe}} @class="gh-btn gh-btn-red gh-btn-icon" />
-</div>
diff --git a/ghost/admin/app/components/modal-disconnect-stripe.js b/ghost/admin/app/components/modal-disconnect-stripe.js
deleted file mode 100644
index 89599e3d0e0..00000000000
--- a/ghost/admin/app/components/modal-disconnect-stripe.js
+++ /dev/null
@@ -1,24 +0,0 @@
-import ModalComponent from 'ghost-admin/components/modal-base';
-import {alias} from '@ember/object/computed';
-import {task} from 'ember-concurrency';
-
-export default ModalComponent.extend({
-    // Allowed actions
-    confirm: () => {},
-
-    stripeConnectAccountName: alias('model.stripeConnectAccountName'),
-
-    actions: {
-        confirm() {
-            this.disconnectStripe.perform();
-        }
-    },
-
-    disconnectStripe: task(function* () {
-        try {
-            yield this.confirm();
-        } finally {
-            this.send('closeModal');
-        }
-    }).drop()
-});
diff --git a/ghost/admin/app/components/modal-free-membership-settings.hbs b/ghost/admin/app/components/modal-free-membership-settings.hbs
deleted file mode 100644
index f0cadd2f519..00000000000
--- a/ghost/admin/app/components/modal-free-membership-settings.hbs
+++ /dev/null
@@ -1,66 +0,0 @@
-<header class="modal-header" data-test-modal="webhook-form">
-    <h1 data-test-text="title">Free membership settings</h1>
-</header>
-<button class="close" href title="Close" type="button" {{action "closeModal"}} {{action (optional this.noop) on="mouseDown"}}>
-    {{svg-jar "close"}}
-</button>
-
-<form>
-<div class="modal-body">
-    <div class="gh-main-section-block">
-        <div class="gh-main-section-content grey gh-tier-priceform-block">
-            <GhFormGroup @errors={{this.price.errors}} @hasValidated={{this.price.hasValidated}} @property="name">
-                <label for="name" class="fw6">Portal display name</label>
-                <GhTextInput
-                    @value={{readonly this.settings.membersFreePriceName}}
-                    @input={{action "updateName" value="target.value"}}
-                    @name="name"
-                    @id="name"
-                    @class="gh-input" />
-                <GhErrorMessage @errors={{this.price.errors}} @property="name" />
-            </GhFormGroup>
-            <GhFormGroup @errors={{this.price.errors}} @hasValidated={{this.price.hasValidated}} @property="description">
-                <label for="description" class="fw6">Description</label>
-                <GhTextInput
-                    @value={{readonly this.settings.membersFreePriceDescription}}
-                    @input={{action "updateDescription" value="target.value"}}
-                    @name="description"
-                    @id="description"
-                    @class="gh-input" />
-                <GhErrorMessage @errors={{this.price.errors}} @property="description" />
-            </GhFormGroup>
-            <GhFormGroup @errors={{this.price.errors}} @hasValidated={{this.price.hasValidated}} @property="welcome-page">
-                <label for="welcome-page" class="fw6">Welcome page</label>
-                <GhUrlInput
-                    @value={{readonly this.settings.membersFreeSignupRedirect}}
-                    @baseUrl={{readonly this.siteUrl}}
-                    @setResult={{action "setFreeSignupRedirect"}}
-                    @validateUrl={{action "validateFreeSignupRedirect"}}
-                    @placeholder={{readonly this.siteUrl}}
-                />
-                <GhErrorMessage
-                    @errors={{this.settings.errors}}
-                    @property="membersFreeSignupRedirect"
-                />
-                <p>Redirect to this URL after signing up for a free membership</p>
-                <GhErrorMessage @errors={{this.price.errors}} @property="welcome-page" />
-            </GhFormGroup>
-        </div>
-    </div>
-</div>
-</form>
-
-<div class="modal-footer">
-    <button
-        class="gh-btn" data-test-button="cancel-webhook" type="button" {{action "closeModal"}}
-        {{!-- disable mouseDown so it doesn't trigger focus-out validations --}}
-        {{!-- {{action (optional this.noop) on="mouseDown"}} --}}
-    >
-        <span>Cancel</span>
-    </button>
-    <GhTaskButton @buttonText="Save"
-        {{!-- @successText={{this.successText}} --}}
-        @task={{this.save}}
-        @class="gh-btn gh-btn-black gh-btn-icon"
-        data-test-button="save-price" />
-</div>
\ No newline at end of file
diff --git a/ghost/admin/app/components/modal-free-membership-settings.js b/ghost/admin/app/components/modal-free-membership-settings.js
deleted file mode 100644
index b420f0b9eaf..00000000000
--- a/ghost/admin/app/components/modal-free-membership-settings.js
+++ /dev/null
@@ -1,86 +0,0 @@
-import ModalBase from 'ghost-admin/components/modal-base';
-import classic from 'ember-classic-decorator';
-import {action} from '@ember/object';
-import {inject} from 'ghost-admin/decorators/inject';
-import {inject as service} from '@ember/service';
-import {task} from 'ember-concurrency';
-import {tracked} from '@glimmer/tracking';
-
-// TODO: update modals to work fully with Glimmer components
-@classic
-export default class ModalFreeMembershipSettings extends ModalBase {
-    @service settings;
-
-    @inject config;
-
-    @tracked freeSignupRedirect;
-
-    get siteUrl() {
-        return this.config.blogUrl;
-    }
-
-    @action
-    close(event) {
-        event?.preventDefault?.();
-        this.closeModal();
-    }
-
-    actions = {
-        // needed because ModalBase uses .send() for keyboard events
-        closeModal() {
-            this.close();
-        },
-        updateName(value) {
-            this.settings.membersFreePriceName = value;
-        },
-        updateDescription(value) {
-            this.settings.membersFreePriceDescription = value;
-        },
-        setFreeSignupRedirect(url) {
-            this.freeSignupRedirect = url;
-        },
-        validateFreeSignupRedirect() {
-            return this._validateSignupRedirect(this.freeSignupRedirect, 'membersFreeSignupRedirect');
-        }
-    };
-
-    @task({drop: true})
-    *save() {
-        try {
-            this.send('validateFreeSignupRedirect');
-            if (this.settings.errors.length !== 0) {
-                return;
-            }
-            yield this.settings.save();
-            this.send('closeModal');
-        } catch (error) {
-            this.notifications.showAPIError(error, {key: 'settings.save'});
-        } finally {
-            this.send('closeModal');
-        }
-    }
-
-    _validateSignupRedirect(url, type) {
-        let errMessage = `Please enter a valid URL`;
-        this.settings.errors.remove(type);
-        this.settings.hasValidated.removeObject(type);
-
-        if (url === null) {
-            this.settings.errors.add(type, errMessage);
-            this.settings.hasValidated.pushObject(type);
-            return false;
-        }
-
-        if (url === undefined) {
-            // Not initialised
-            return;
-        }
-
-        if (url.href.startsWith(this.siteUrl)) {
-            const path = url.href.replace(this.siteUrl, '');
-            this.settings.type = path;
-        } else {
-            this.settings.type = url.href;
-        }
-    }
-}
diff --git a/ghost/admin/app/components/modal-import-content.hbs b/ghost/admin/app/components/modal-import-content.hbs
deleted file mode 100644
index 69dcdf457cc..00000000000
--- a/ghost/admin/app/components/modal-import-content.hbs
+++ /dev/null
@@ -1,89 +0,0 @@
-<div class="gh-content-import-wrapper">
-    {{#if (eq this.state 'INIT')}}
-        <header class="modal-header" data-test-modal="import-content">
-            <h1>Import content</h1>
-        </header>
-    {{/if}}
-
-    {{#if (eq this.state 'UPLOADING')}}
-        <header class="modal-header" data-test-modal="import-content">
-            <h1>Uploading</h1>
-        </header>
-    {{/if}}
-
-    {{#if (eq this.state 'PROCESSING')}}
-        <header class="modal-header icon-center" data-test-modal="import-content">
-            {{svg-jar "import-in-progress" class="gh-import-content-icon"}}
-            <h1>Import in progress</h1>
-        </header>
-    {{/if}}
-
-    {{#if (eq this.state 'ERROR')}}
-        <header class="modal-header" data-test-modal="import-content">
-            <h1>{{this.errorHeader}}</h1>
-        </header>
-    {{/if}}
-
-    <button class="close" data-test-button="close-import-content" type="button" {{on "click" @close}}>
-        {{svg-jar "close"}}
-        <span class="hidden">Close</span>
-    </button>
-
-    <div class="modal-body">
-        {{#if (eq this.state 'INIT')}}
-            <ModalImportContent::ContentFileSelect @setFile={{action "setFile"}} />
-        {{/if}}
-
-        {{#if (eq this.state 'UPLOADING')}}
-            <div class="gh-import-content-spinner">
-                <GhLoadingSpinner />
-            </div>
-        {{/if}}
-
-        {{#if (eq this.state 'PROCESSING')}}
-        <div class="gh-content-import-resultcontainer">
-            <div class="gh-content-import-result-summary">
-                <p>Your import is being processed, and you&apos;ll receive a confirmation email as soon as it&apos;s complete. Usually this only takes a few minutes, but larger imports may take longer.</p>
-            </div>
-        </div>
-        {{/if}}
-
-        {{#if (eq this.state 'ERROR')}}
-            <div class="failed flex items-start gh-content-upload-errorcontainer error">
-                <div class="mr2">{{svg-jar "warning" class="nudge-top--2 w4 h4 fill-red"}}</div>
-                <p class="ma0 pa0">{{this.errorMessage}}</p>
-            </div>
-        {{/if}}
-    </div>
-
-    <div class="modal-footer">
-        {{#if (eq this.state 'INIT')}}
-            <button class="gh-btn" data-test-button="close-import-content" type="button" {{on "click" @close}}>
-                <span>Close</span>
-            </button>
-        {{/if}}
-
-        {{#if (eq this.state 'UPLOADING')}}
-            <button class="gh-btn" data-test-button="close-import-content" type="button" {{on "click" @close}}>
-                <span>Cancel</span>
-            </button>
-        {{/if}}
-
-        {{#if (eq this.state 'PROCESSING')}}
-            <button class="gh-btn gh-btn-black" data-test-button="close-import-content" type="button" {{on "click" @close}}>
-                <span>Got it</span>
-            </button>
-        {{/if}}
-
-        {{#if (eq this.state 'ERROR')}}
-            {{#if this.showTryAgainButton}}
-                <button class="gh-btn" data-test-button="restart-import-content" type="button" {{action "reset"}}>
-                    <span>Try again</span>
-                </button>
-            {{/if}}
-            <button class="gh-btn gh-btn-black" data-test-button="close-import-content" type="button" {{on "click" @close}}>
-                <span>OK</span>
-            </button>
-        {{/if}}
-    </div>
-</div>
\ No newline at end of file
diff --git a/ghost/admin/app/components/modal-import-content.js b/ghost/admin/app/components/modal-import-content.js
deleted file mode 100644
index f4d33873441..00000000000
--- a/ghost/admin/app/components/modal-import-content.js
+++ /dev/null
@@ -1,108 +0,0 @@
-import ModalComponent from 'ghost-admin/components/modal-base';
-import ghostPaths from 'ghost-admin/utils/ghost-paths';
-import {GENERIC_ERROR_MESSAGE} from 'ghost-admin/services/notifications';
-import {computed} from '@ember/object';
-import {getErrorCode} from '../services/ajax';
-import {inject} from 'ghost-admin/decorators/inject';
-import {
-    isRequestEntityTooLargeError,
-    isUnsupportedMediaTypeError,
-    isVersionMismatchError
-} from 'ghost-admin/services/ajax';
-import {inject as service} from '@ember/service';
-
-export default ModalComponent.extend({
-    ajax: service(),
-    notifications: service(),
-    store: service(),
-
-    state: 'INIT',
-
-    file: null,
-    paramName: 'importfile',
-    importResponse: null,
-    errorMessage: null,
-    errorHeader: null,
-    showTryAgainButton: true,
-
-    // Allowed actions
-    confirm: () => {},
-
-    config: inject(),
-
-    uploadUrl: computed(function () {
-        return `${ghostPaths().apiRoot}/db`;
-    }),
-
-    formData: computed('file', function () {
-        let formData = new FormData();
-        formData.append(this.paramName, this.file);
-        return formData;
-    }),
-
-    actions: {
-        setFile(file) {
-            this.set('file', file);
-            this.generateRequest();
-        },
-
-        reset() {
-            this.set('errorMessage', null);
-            this.set('errorHeader', null);
-            this.set('file', null);
-            this.set('state', 'INIT');
-            this.set('showTryAgainButton', true);
-        },
-
-        closeModal() {
-            if (this.state !== 'UPLOADING') {
-                this._super(...arguments);
-            }
-        },
-
-        // noop - we don't want the enter key doing anything
-        confirm() {}
-    },
-
-    generateRequest() {
-        let ajax = this.ajax;
-        let formData = this.formData;
-        let url = this.uploadUrl;
-
-        this.set('state', 'UPLOADING');
-        ajax.post(url, {
-            data: formData,
-            processData: false,
-            contentType: false,
-            dataType: 'text'
-        }).then(() => {
-            this.set('state', 'PROCESSING');
-        }).catch((error) => {
-            this._uploadError(error);
-            this.set('state', 'ERROR');
-        });
-    },
-
-    _uploadError(error) {
-        let message;
-        let header = 'Import error';
-
-        if (isVersionMismatchError(error)) {
-            this.notifications.showAPIError(error);
-        }
-
-        if (getErrorCode(error) === 'INVALID_ZIP_FILE_NAME_ENCODING') {
-            message = 'The uploaded zip could not be read due to a long or invalid file name. Please remove any special characters from the file name, or alternatively try another archiving tool if using MacOS Archive Utility.';
-        } else if (isUnsupportedMediaTypeError(error)) {
-            message = 'The file type you uploaded is not supported.';
-        } else if (isRequestEntityTooLargeError(error)) {
-            message = 'The file you uploaded was larger than the maximum file size your server allows.';
-        } else {
-            console.error(error); // eslint-disable-line
-            message = GENERIC_ERROR_MESSAGE;
-        }
-
-        this.set('errorMessage', message);
-        this.set('errorHeader', header);
-    }
-});
diff --git a/ghost/admin/app/components/modal-import-content/content-file-select.hbs b/ghost/admin/app/components/modal-import-content/content-file-select.hbs
deleted file mode 100644
index ecd171655f3..00000000000
--- a/ghost/admin/app/components/modal-import-content/content-file-select.hbs
+++ /dev/null
@@ -1,20 +0,0 @@
-{{#if this.error}}
-    <div class="failed flex items-start gh-content-upload-errorcontainer error">
-        <div class="mr2">{{svg-jar "warning" class="nudge-top--2 w4 h4 fill-red"}}</div>
-        <p class="ma0 pa0">{{this.error.message}}</p>
-    </div>
-{{/if}}
-<div class="upload-form br3">
-    <section class="gh-image-uploader gh-content-import-uploader {{this.dragClass}}"
-        {{on "drop" this.drop}}
-        {{on "dragover" this.dragOver}}
-        {{on "dragleave" this.dragLeave}}
-    >
-        <GhFileInput @multiple={{false}} @alt={{this.labelText}} @action={{this.fileSelected}} @accept={{this.accept}} data-test-fileinput="content-import">
-        <div class="flex flex-column items-center">
-            {{svg-jar "upload"}}
-            <div class="description">{{this.labelText}}</div>
-        </div>
-        </GhFileInput>
-    </section>
-</div>
diff --git a/ghost/admin/app/components/modal-import-content/content-file-select.js b/ghost/admin/app/components/modal-import-content/content-file-select.js
deleted file mode 100644
index e1ae4814528..00000000000
--- a/ghost/admin/app/components/modal-import-content/content-file-select.js
+++ /dev/null
@@ -1,79 +0,0 @@
-import Component from '@glimmer/component';
-import {UnsupportedMediaTypeError} from 'ghost-admin/services/ajax';
-import {action} from '@ember/object';
-import {tracked} from '@glimmer/tracking';
-
-export default class ContentFileSelect extends Component {
-    labelText = 'Select or drop a JSON or zip file';
-
-    @tracked error = null;
-    @tracked dragClass = null;
-
-    /*
-    constructor(...args) {
-        super(...args);
-        assert(this.args.setFile);
-    }
-    */
-
-    @action
-    fileSelected(fileList) {
-        let [file] = Array.from(fileList);
-
-        try {
-            this._validateFileType(file);
-            this.error = null;
-        } catch (err) {
-            this.error = err;
-            return;
-        }
-
-        this.args.setFile(file);
-    }
-
-    @action
-    dragOver(event) {
-        if (!event.dataTransfer) {
-            return;
-        }
-
-        // this is needed to work around inconsistencies with dropping files
-        // from Chrome's downloads bar
-        if (navigator.userAgent.indexOf('Chrome') > -1) {
-            let eA = event.dataTransfer.effectAllowed;
-            event.dataTransfer.dropEffect = (eA === 'move' || eA === 'linkMove') ? 'move' : 'copy';
-        }
-
-        event.stopPropagation();
-        event.preventDefault();
-
-        this.dragClass = '-drag-over';
-    }
-
-    @action
-    dragLeave(event) {
-        event.preventDefault();
-        this.dragClass = null;
-    }
-
-    @action
-    drop(event) {
-        event.preventDefault();
-        this.dragClass = null;
-        if (event.dataTransfer.files) {
-            this.fileSelected(event.dataTransfer.files);
-        }
-    }
-
-    _validateFileType(file) {
-        let [, extension] = (/(?:\.([^.]+))?$/).exec(file.name);
-
-        if (extension.toLowerCase() !== 'json' && extension.toLowerCase() !== 'zip') {
-            throw new UnsupportedMediaTypeError({
-                message: 'The file type you uploaded is not supported'
-            });
-        }
-
-        return true;
-    }
-}
diff --git a/ghost/admin/app/components/modal-invite-new-user.hbs b/ghost/admin/app/components/modal-invite-new-user.hbs
deleted file mode 100644
index 8f2b66445fd..00000000000
--- a/ghost/admin/app/components/modal-invite-new-user.hbs
+++ /dev/null
@@ -1,59 +0,0 @@
-{{!-- disable mouseDown so it doesn't trigger focus-out validations --}}
-<a class="close" href role="button" title="Close" {{action "closeModal"}} {{action (optional this.noop) on="mouseDown"}}>
-    {{svg-jar "close"}}<span class="hidden">Close</span>
-</a>
-
-<div class="gh-modal-invite-user">
-    <header class="modal-header" data-test-modal="invite-staff-user">
-        <h1>Invite a new staff user</h1>
-        <p>Send an invitation for a new person to create a staff account on your site, and select a role that matches what you’d like them to be able to do.</p>
-    </header>
-
-    <div class="modal-body">
-        <fieldset>
-            <GhFormGroup @errors={{this.errors}} @hasValidated={{this.hasValidated}} @property="email">
-                <label for="new-user-email">Email address</label>
-                <GhTextInput
-                    @class="email"
-                    @id="new-user-email"
-                    @type="email"
-                    @placeholder="youremail@example.com"
-                    @name="email"
-                    @shouldFocus={{true}}
-                    @autocapitalize="off"
-                    @autocorrect="off"
-                    @value={{readonly this.email}}
-                    @input={{action (mut this.email) value="target.value"}}
-                    @keyEvents={{hash
-                        Enter=(action "confirm")
-                    }}
-                />
-                <GhErrorMessage @errors={{this.errors}} @property="email" />
-            </GhFormGroup>
-
-            <GhRoleSelection
-                @selected={{this.role}}
-                @setRole={{this.setRole}}
-                @onValidationSuccess={{action "roleValidationSucceeded"}}
-                @onValidationFailure={{action "roleValidationFailed"}}
-            />
-        </fieldset>
-    </div>
-    <div class="modal-footer">
-        {{#if this.limitErrorMessage}}
-            <GhTaskButton @buttonText="Upgrade my plan &rarr;"
-                @task={{this.transitionToBilling}}
-                @class="gh-btn gh-btn-green gh-btn-icon"
-                @disableMouseDown="true"
-                data-test-button="upgrade-my-plan" />
-        {{else}}
-            <GhTaskButton @buttonText="Send invitation now &rarr;"
-                @successText="Sent"
-                @task={{this.sendInvitation}}
-                @class="gh-btn gh-btn-black gh-btn-icon"
-                @disabled={{this.fetchRoles.isRunning}}
-                @disableMouseDown="true"
-                data-test-button="send-user-invite" />
-        {{/if}}
-    </div>
-</div>
diff --git a/ghost/admin/app/components/modal-invite-new-user.js b/ghost/admin/app/components/modal-invite-new-user.js
deleted file mode 100644
index 0c8774c5ebe..00000000000
--- a/ghost/admin/app/components/modal-invite-new-user.js
+++ /dev/null
@@ -1,125 +0,0 @@
-import ModalComponent from 'ghost-admin/components/modal-base';
-import RSVP from 'rsvp';
-import ValidationEngine from 'ghost-admin/mixins/validation-engine';
-import {action} from '@ember/object';
-import {A as emberA} from '@ember/array';
-import {inject as service} from '@ember/service';
-import {task} from 'ember-concurrency';
-
-const {Promise} = RSVP;
-
-export default ModalComponent.extend(ValidationEngine, {
-    router: service(),
-    notifications: service(),
-    store: service(),
-
-    classNames: 'modal-content invite-new-user',
-
-    role: null,
-    limitErrorMessage: null,
-
-    validationType: 'inviteUser',
-
-    willDestroyElement() {
-        this._super(...arguments);
-        // TODO: this should not be needed, ValidationEngine acts as a
-        // singleton and so it's errors and hasValidated state stick around
-        this.errors.clear();
-        this.set('hasValidated', emberA());
-    },
-
-    actions: {
-        confirm() {
-            this.sendInvitation.perform();
-        },
-
-        roleValidationFailed(reason) {
-            this.set('limitErrorMessage', reason);
-        },
-
-        roleValidationSucceeded() {
-            this.set('limitErrorMessage', null);
-        }
-    },
-
-    setRole: action(function (role) {
-        this.set('role', role);
-        this.errors.remove('role');
-    }),
-
-    validate() {
-        let email = this.email;
-
-        // TODO: either the validator should check the email's existence or
-        // the API should return an appropriate error when attempting to save
-        return new Promise((resolve, reject) => this._super().then(() => RSVP.hash({
-            users: this.store.findAll('user', {reload: true}),
-            invites: this.store.findAll('invite', {reload: true})
-        }).then((data) => {
-            let existingUser = data.users.findBy('email', email);
-            let existingInvite = data.invites.findBy('email', email);
-
-            if (existingUser || existingInvite) {
-                this.errors.clear('email');
-                if (existingUser) {
-                    this.errors.add('email', 'A user with that email address already exists.');
-                } else {
-                    this.errors.add('email', 'A user with that email address was already invited.');
-                }
-
-                // TODO: this shouldn't be needed, ValidationEngine doesn't mark
-                // properties as validated when validating an entire object
-                this.hasValidated.addObject('email');
-                reject();
-            } else {
-                resolve();
-            }
-        }), () => {
-            // TODO: this shouldn't be needed, ValidationEngine doesn't mark
-            // properties as validated when validating an entire object
-            this.hasValidated.addObject('email');
-            reject();
-        }));
-    },
-
-    sendInvitation: task(function* () {
-        let email = this.email;
-        let role = this.role;
-        let notifications = this.notifications;
-        let invite;
-
-        try {
-            yield this.validate();
-
-            invite = this.store.createRecord('invite', {
-                email,
-                role
-            });
-
-            yield invite.save();
-
-            // If sending the invitation email fails, the API will still return a status of 201
-            // but the invite's status in the response object will be 'invited-pending'.
-            if (invite.get('status') === 'pending') {
-                notifications.showAlert('Invitation email was not sent', {type: 'error', key: 'invite.send.failed', description: 'Please try resending.'});
-            } else {
-                notifications.showNotification('Invitation sent', {icon: 'send-email', key: 'invite.send.success', description: `${email}`});
-            }
-
-            this.send('closeModal');
-        } catch (error) {
-            // validation will reject and cause this to be called with no error
-            if (error) {
-                invite.deleteRecord();
-                notifications.showAPIError(error, {key: 'invite.send'});
-                this.send('closeModal');
-            }
-        }
-    }).drop(),
-
-    transitionToBilling: task(function () {
-        this.router.transitionTo('pro');
-
-        this.send('closeModal');
-    })
-});
diff --git a/ghost/admin/app/components/modal-portal-settings.hbs b/ghost/admin/app/components/modal-portal-settings.hbs
deleted file mode 100644
index 69cf2424d20..00000000000
--- a/ghost/admin/app/components/modal-portal-settings.hbs
+++ /dev/null
@@ -1,393 +0,0 @@
-{{!-- template-lint-disable no-invalid-interactive --}}
-<div class="modal-body gh-ps-modal-body modal-fullsettings modal-fullsettings-body ">
-    <div class="flex pa0 flex-grow-1 gh-portal-settings gh-newsletters-labs" {{did-insert this.finishPreloading}}>
-        {{#if this.isPreloading}}
-            <GhLoadingSpinner />
-        {{else}}
-        <div class="gh-portal-settings-sidebar modal-fullsettings-sidebar-labs">
-            <h2 class="modal-fullsettings-heading-labs gh-portal-settings-title">Portal settings</h2>
-            <div class="modal-fullsettings-body-labs">
-                <fieldset class="modal-fullsettings-form-labs">
-                    <div class="modal-fullsettings-section-labs">
-                        {{#let (eq this.openSection "signup-options") as |isOpen|}}
-                            <button class="modal-fullsettings-tab {{if isOpen "active"}}" type="button" onclick={{action "toggleSection" "signup-options"}}>
-                                {{svg-jar "credit-card"}} Signup options
-                                <span class="gh-nav-button-expand">{{svg-jar (if isOpen "arrow-up-stroke" "arrow-down-stroke")}}</span>
-                            </button>
-                            {{#liquid-if isOpen}}
-                                <div class="modal-fullsettings-tab-expanded {{if (not-eq this.settings.membersSignupAccess "all") "disabled-overlay"}}" onclick={{action "switchPreviewPage" "signup"}}>
-                                    <GhFormGroup class="gh-members-subscribed-checkbox gh-portal-setting-first {{unless this.membersUtils.isStripeEnabled "gh-portal-setting-last"}} mb0">
-                                        <div class="flex justify-between items-center">
-                                            <div class="mr3">
-                                                <h4 class="gh-portal-setting-title">Display name in signup form</h4>
-                                            </div>
-                                            <div class="for-switch small">
-                                                <label
-                                                    class="switch"
-                                                    for="signup-name-checkbox"
-                                                >
-                                                    <input
-                                                        type="checkbox"
-                                                        checked={{this.settings.portalName}}
-                                                        id="signup-name-checkbox"
-                                                        name="signup-name-checkbox"
-                                                        disabled={{not-eq this.settings.membersSignupAccess "all"}}
-                                                        {{on "click" (action "togglePortalName" value="target.checked")}}
-                                                    >
-                                                    <span class="input-toggle-component"></span>
-                                                </label>
-                                            </div>
-                                        </div>
-                                    </GhFormGroup>
-                                    <div {{did-insert this.refreshAfterStripeConnected}} data-test-tiers-at-signup>
-                                        <div class="mb3 mt5">
-                                            <h4 class="gh-portal-setting-title">Tiers available at signup</h4>
-                                        </div>
-                                        <div class="form-group mb0 for-checkbox" data-test-free-tier-at-signup>
-                                            <label
-                                                class="checkbox"
-                                                for="free-plan"
-                                            >
-                                                <input
-                                                    type="checkbox"
-                                                    checked={{this.membersUtils.isFreeChecked}}
-                                                    id="free-plan"
-                                                    name="free-plan"
-                                                    data-test-settings-tier-input="Free"
-                                                    disabled={{not-eq this.settings.membersSignupAccess "all"}}
-                                                    class="gh-input post-settings-featured"
-                                                    {{on "click" (action "togglePlan" "free")}}
-                                                >
-                                                <span class="input-toggle-component"></span>
-                                                <p data-test-settings-tier-label="Free">Free</p>
-                                            </label>
-                                        </div>
-                                        {{#if this.membersUtils.isStripeEnabled}}
-                                            {{#each this.tiers as |tier|}}
-                                                <div class="form-group mb0 for-checkbox" data-test-tier-at-signup>
-                                                    <label
-                                                        class="checkbox"
-                                                        for={{tier.id}}
-                                                    >
-                                                        <input
-                                                            type="checkbox"
-                                                            id={{tier.id}}
-                                                            name={{tier.id}}
-                                                            checked={{tier.checked}}
-                                                            disabled={{or
-                                                                (not this.membersUtils.isStripeEnabled)
-                                                                (not-eq this.settings.membersSignupAccess "all")
-                                                            }}
-                                                            class="gh-input post-settings-featured"
-                                                            data-test-settings-tier-input={{tier.name}}
-                                                            {{on "click" (action "toggleTier" tier.id)}}
-                                                        >
-                                                        <span class="input-toggle-component"></span>
-                                                        <p data-test-settings-tier-label={{tier.name}}>{{tier.name}}</p>
-                                                    </label>
-                                                </div>
-                                            {{/each}}
-                                            {{#if this.showPortalPrices}}
-                                                <div class="mb3 mt5">
-                                                    <h4 class="gh-portal-setting-title">Prices available at signup</h4>
-                                                </div>
-                                            {{/if}}
-                                            {{#if this.showPortalPrices}}
-                                                <div class="form-group mb0 for-checkbox">
-                                                    <label
-                                                        class="checkbox"
-                                                        for="monthly-plan"
-                                                    >
-                                                        <input
-                                                            type="checkbox"
-                                                            id="monthly-plan"
-                                                            name="monthly-plan"
-                                                            checked={{this.isMonthlyChecked}}
-                                                            disabled={{or
-                                                                (not this.membersUtils.isStripeEnabled)
-                                                                (not-eq this.settings.membersSignupAccess "all")
-                                                            }}
-                                                            class="gh-input post-settings-featured"
-                                                            {{on "click" (action "togglePlan" "monthly")}}
-                                                        >
-                                                        <span class="input-toggle-component"></span>
-                                                        <p>Monthly</p>
-                                                    </label>
-                                                </div>
-                                                <div class="form-group mb0 for-checkbox">
-                                                    <label
-                                                        class="checkbox"
-                                                        for="yearly-plan"
-                                                    >
-                                                        <input
-                                                            type="checkbox"
-                                                            id="yearly-plan"
-                                                            name="yearly-plan"
-                                                            checked={{this.isYearlyChecked}}
-                                                            disabled={{or
-                                                                (not this.membersUtils.isStripeEnabled)
-                                                                (not-eq this.settings.membersSignupAccess "all")
-                                                            }}
-                                                            class="gh-input post-settings-featured"
-                                                            {{on "click" (action "togglePlan" "yearly")}}
-                                                        >
-                                                        <span class="input-toggle-component"></span>
-                                                        <p>Yearly</p>
-                                                    </label>
-                                                </div>
-                                            {{/if}}
-                                        {{/if}}
-                                    </div>
-
-                                    <GhFormGroup class="gh-stack-item mt5 mb5" @errors={{this.settings.errors}} @hasValidated={{this.settings.hasValidated}}>
-                                        <label class="modal-fullsettings-title" for="footer">Display notice at signup</label>
-                                        <textarea
-                                            id="footer"
-                                            name="footer"
-                                            class="miw-100 form-text gh-members-emailsettings-footer-input"
-                                            placeholder="By signing up, I agree to receive emails from {{this.config.blogTitle}}."
-                                            {{on "change" this.setTermsHtml}}
-                                        >{{this.settings.portalSignupTermsHtml}}</textarea>
-                                        <GhErrorMessage @errors={{this.settings.errors}} @property="portalSignupTermsHtml" />
-                                        <p>
-                                            Recommended: <strong>{{this.maxTermsLength}}</strong> characters.
-                                            You've used {{gh-count-down-html-characters this.settings.portalSignupTermsHtml this.maxTermsLength}}
-                                        </p>
-                                    </GhFormGroup>
-
-                                    <GhFormGroup class="gh-members-subscribed-checkbox gh-portal-setting-first mb0 b--whitegrey space-l">
-                                        <div class="flex justify-between items-center">
-                                            <h4 class="gh-portal-setting-title">Require agreement</h4>
-                                            <div class="for-switch small">
-                                                <label
-                                                    class="switch"
-                                                    for="portal-signup-checkbox-required-checkbox"
-                                                >
-                                                    <input
-                                                        type="checkbox"
-                                                        checked={{this.settings.portalSignupCheckboxRequired}}
-                                                        id="portal-signup-checkbox-required-checkbox"
-                                                        name="portal-signup-checkbox-required-checkbox"
-                                                        onclick={{action "toggleSignupCheckboxRequired" value="target.checked"}}
-                                                    >
-                                                    <span class="input-toggle-component"></span>
-                                                </label>
-                                            </div>
-                                        </div>
-                                    </GhFormGroup>
-                                </div>
-                            {{/liquid-if}}
-                        {{/let}}
-
-                        {{#let (eq this.openSection "look-and-feel") as |isOpen|}}
-                            <button class="modal-fullsettings-tab {{if isOpen "active"}}" type="button" onclick={{action "toggleSection" "look-and-feel"}}>
-                                {{svg-jar "paintbrush"}} Look & feel
-                                <span class="gh-nav-button-expand">{{svg-jar (if isOpen "arrow-up-stroke" "arrow-down-stroke")}}</span>
-                            </button>
-                            {{#liquid-if isOpen}}
-                                <div class="modal-fullsettings-tab-expanded" onclick={{action "switchPreviewPage" "signup"}}>
-                                    <GhFormGroup class="gh-members-subscribed-checkbox gh-portal-setting-first mb0 b--whitegrey">
-                                        <div class="flex justify-between items-center">
-                                            <h4 class="gh-portal-setting-title">Show Portal button</h4>
-                                            <div class="for-switch small">
-                                                <label
-                                                    class="switch"
-                                                    for="portal-button-checkbox"
-                                                >
-                                                    <input
-                                                        type="checkbox"
-                                                        checked={{this.settings.portalButton}}
-                                                        id="portal-button-checkbox"
-                                                        name="portal-button-checkbox"
-                                                        onclick={{action "togglePortalButton" value="target.checked"}}
-                                                    >
-                                                    <span class="input-toggle-component"></span>
-                                                </label>
-                                            </div>
-                                        </div>
-                                    </GhFormGroup>
-                                    {{#if this.settings.portalButton}}
-                                        <div class="mt5">
-                                            <GhFormGroup class="space-l">
-                                                <h4 class="gh-portal-setting-title mb1">Portal button style</h4>
-                                                <span
-                                                    class="gh-select mt2"
-                                                    data-select-text="test"
-                                                    tabindex="0"
-                                                >
-                                                    <OneWaySelect
-                                                        @id="portal-button-style"
-                                                        @name="portal[button-style]"
-                                                        @options={{this.buttonStyleOptions}}
-                                                        @optionValuePath="name"
-                                                        @optionLabelPath="label"
-                                                        @value={{this.selectedButtonStyle}}
-                                                        @update={{action "setButtonStyle"}}
-                                                    />
-                                                    {{svg-jar "arrow-down-small"}}
-                                                </span>
-                                            </GhFormGroup>
-                                            {{#if this.showIconSetting}}
-                                                <GhFormGroup class="space-l">
-                                                    <h4 class="gh-portal-setting-title">Icon</h4>
-                                                    <GhUploader
-                                                        @extensions={{this.iconExtensions}}
-                                                        @paramsHash={{hash purpose="image"}}
-                                                        @onComplete={{action "imageUploaded" "buttonIcon"}}
-                                                        as
-                                                        |uploader|
-                                                    >
-                                                        <div class="flex items-center justify-between mt2 br3 ba b--whitegrey bg-white">
-                                                            <div class="gh-portal-settings-icons">
-                                                                {{#each this.membersUtils.defaultButtonIcons as |imgIcon| }}
-                                                                    <span class="gh-portal-button-icon {{if (eq this.membersUtils.buttonIcon imgIcon.value) "selected-icon"}}" onclick={{action "selectDefaultIcon" imgIcon.value}}>
-                                                                        {{svg-jar imgIcon.icon}}
-                                                                    </span>
-                                                                {{/each}}
-                                                            </div>
-                                                            <div class="flex gh-setting-action gh-portal-custom-icon">
-                                                                {{#if uploader.isUploading}}
-                                                                    <div class="gh-portal-button-icon">
-                                                                        <div class="gh-loading-spinner"></div>
-                                                                    </div>
-                                                                {{else if this.customIcon}}
-                                                                    <img
-                                                                        class="gh-portal-button-icon gh-portal-button-custom {{if (eq this.membersUtils.buttonIcon this.customIcon) "selected-icon"}}"
-                                                                        src="{{this.customIcon}}"
-                                                                        onclick={{action "selectDefaultIcon" this.customIcon}}
-                                                                        alt="icon"
-                                                                        data-test-icon-img
-                                                                    >
-                                                                    {{#if (eq this.membersUtils.buttonIcon this.customIcon)}}
-                                                                    <button type="button" class="gh-btn gh-portal-button-deleteicon" {{action "deleteCustomIcon"}}>
-                                                                        <span> {{svg-jar "trash" class="w5 h5"}} </span>
-                                                                    </button>
-                                                                    {{/if}}
-                                                                {{else}}
-                                                                    <button type="button" class="gh-btn gh-portal-button-uploadicon" onclick={{action "triggerFileDialog"}} data-test-image-upload-btn="icon" data-tooltip="Upload icon">
-                                                                        <span>{{svg-jar "upload-fill" class="w5 h5"}}</span>
-                                                                    </button>
-                                                                    <div style="display:none">
-                                                                        <GhFileInput
-                                                                            @multiple={{false}}
-                                                                            @action={{uploader.setFiles}}
-                                                                            @accept={{this.iconMimeTypes}}
-                                                                            data-test-file-input="icon"
-                                                                        />
-                                                                    </div>
-                                                                {{/if}}
-                                                            </div>
-                                                        </div>
-                                                    </GhUploader>
-
-                                                </GhFormGroup>
-                                            {{/if}}
-                                        </div>
-                                        {{#if this.showButtonTextSetting}}
-                                        <GhFormGroup class="space-l">
-                                            <h4 class="gh-portal-setting-title">Signup button text</h4>
-
-                                            <div class="flex items-center mt2">
-                                                <GhTextInput
-                                                    @value={{readonly this.settings.portalButtonSignupText}}
-                                                    @type="text"
-                                                    @input={{action "setSignupButtonText"}}
-                                                />
-                                            </div>
-                                        </GhFormGroup>
-                                        {{/if}}
-                                    {{/if}}
-                                </div>
-                            {{/liquid-if}}
-                        {{/let}}
-
-                        {{#let (eq this.openSection "account-page") as |isOpen|}}
-                            <button class="modal-fullsettings-tab {{if isOpen "active"}}" type="button" onclick={{action "toggleSection" "account-page"}}>
-                                {{svg-jar "members"}} Account page settings
-                                <span class="gh-nav-button-expand">{{svg-jar (if isOpen "arrow-up-stroke" "arrow-down-stroke")}}</span>
-                            </button>
-                            {{#liquid-if isOpen}}
-                                <div class="modal-fullsettings-tab-expanded" onclick={{action "switchPreviewPage" "accountHome"}}>
-                                    <GhFormGroup class="space-l mt5" @errors={{this.settings.errors}} @hasValidated={{this.settings.hasValidated}} @property="members_support_address">
-                                        <h4 class="gh-portal-setting-title">Support email address</h4>
-                                        <div class="mt2">
-                                            <GhTextInput
-                                                @value={{readonly this.supportAddress}}
-                                                @input={{action "setSupportAddress" value="target.value"}}
-                                                @name="members_support_address"
-                                            />
-                                        </div>
-                                        <GhErrorMessage @errors={{this.settings.errors}} @property="members_support_address" />
-                                        <p>How members can reach you for help with their account (public)</p>
-                                    </GhFormGroup>
-                                </div>
-                            {{/liquid-if}}
-                        {{/let}}
-                    </div>
-                </fieldset>
-            </div>
-            {{#if (and (not this.membersUtils.isStripeEnabled) this.session.user.isAdmin)}}
-            <div class="gh-portal-settings-stripefooter">
-                <h4>Collect payments on signup?</h4>
-                <p>Generate revenue to support your work, by offering premium membership tiers.</p>
-                <p>Ghost takes 0% payment fees, everything you earn is yours to keep.</p>
-                <button class="stripe-connect {{unless this.session.user.isAdmin "disabled"}}" type="button" {{on "click" (action "openStripeConnect")}}><span></span></button>
-            </div>
-            {{/if}}
-        </div>
-        <div class="gh-portal-settings-main">
-            <div class="gh-portal-settings-previewheader">
-
-                <div class="gh-select gh-preview-page-selector" data-test-select="preview-page-selector">
-                    <OneWaySelect
-                        @data-test-select="page-selector"
-                        @value={{this.page}}
-                        @options={{this.availablePages}}
-                        @optionValuePath="name"
-                        @optionLabelPath="label"
-                        @update={{action "switchPreviewPage"}}
-                    />
-                    {{svg-jar "arrow-down-small"}}
-                </div>
-
-                <div class="gh-portal-settings-actions">
-                    <button
-                        class="gh-btn mr3" type="button" {{action "closeModal"}}
-                        {{!-- disable mouseDown so it doesn't trigger focus-out validations --}}
-                        {{on "mousedown" (optional this.noop)}}
-                    >
-                        <span>Cancel</span>
-                    </button>
-
-                    <GhTaskButton
-                        @buttonText="Save and close"
-                        @successText="Saved"
-                        @task={{this.saveTask}}
-                        @idleClass="gh-btn-primary"
-                        @class="gh-btn gh-btn-icon"
-                        data-test-button="save-members-modal-setting"
-                    />
-                </div>
-            </div>
-
-            {{#if this.showLinksPage}}
-            <div class="gh-portal-preview-wrapper">
-                <div class="gh-portal-preview-container">
-                    <GhPortalLinks />
-                </div>
-            </div>
-            {{/if}}
-
-            <div class="gh-portal-preview-container {{if this.showLinksPage "hide"}}">
-                <div class="gh-portal-site-frame-cover"> </div>
-                <GhSiteIframe
-                    class="gh-portal-siteiframe gh-portal-siteiframe-enabled"
-                    @src={{this.portalPreviewUrl}}
-                    @guid={{this.portalPreviewGuid}}
-                    @invisibleUntilLoaded="portal-ready" />
-            </div>
-
-        </div>
-        {{/if}}
-    </div>
-</div>
diff --git a/ghost/admin/app/components/modal-portal-settings.js b/ghost/admin/app/components/modal-portal-settings.js
deleted file mode 100644
index f28efaabf5d..00000000000
--- a/ghost/admin/app/components/modal-portal-settings.js
+++ /dev/null
@@ -1,436 +0,0 @@
-import ConfirmEmailModal from './modals/settings/confirm-email';
-import ModalComponent from 'ghost-admin/components/modal-base';
-import copyTextToClipboard from 'ghost-admin/utils/copy-text-to-clipboard';
-import {action, computed} from '@ember/object';
-import {htmlSafe} from '@ember/template';
-import {inject} from 'ghost-admin/decorators/inject';
-import {inject as service} from '@ember/service';
-import {task, timeout} from 'ember-concurrency';
-const ICON_EXTENSIONS = ['gif', 'jpg', 'jpeg', 'png', 'svg'];
-
-export default ModalComponent.extend({
-    modals: service(),
-    membersUtils: service(),
-    settings: service(),
-    store: service(),
-    session: service(),
-    feature: service(),
-    ghostPaths: service(),
-    ajax: service(),
-
-    page: 'signup',
-    iconExtensions: null,
-    isShowModalLink: true,
-    customIcon: null,
-    showLinksPage: false,
-    showLeaveSettingsModal: false,
-    isPreloading: true,
-    changedTiers: null,
-    openSection: null,
-    portalPreviewGuid: 'modal-portal-settings',
-    closeOnEnter: false,
-    maxTermsLength: 115,
-
-    confirm() {},
-
-    config: inject(),
-
-    backgroundStyle: computed('settings.accentColor', function () {
-        let color = this.settings.accentColor || '#ffffff';
-        return htmlSafe(`background-color: ${color}`);
-    }),
-
-    showModalLinkOrAttribute: computed('isShowModalLink', function () {
-        if (this.isShowModalLink) {
-            return `#/portal`;
-        }
-        return `data-portal`;
-    }),
-
-    portalPreviewUrl: computed('page', 'model.tiers.[]', 'changedTiers.[]', 'membersUtils.{isFreeChecked,isMonthlyChecked,isYearlyChecked}', 'settings.{portalName,portalButton,portalButtonIcon,portalButtonSignupText,portalSignupTermsHtml,portalSignupCheckboxRequired,portalButtonStyle,accentColor,portalPlans.[]}', function () {
-        const options = this.getProperties(['page']);
-        options.portalTiers = this.model.tiers?.filter((tier) => {
-            return tier.get('visibility') === 'public'
-                && tier.get('active') === true
-                && tier.get('type') === 'paid';
-        }).map((tier) => {
-            return tier.id;
-        });
-        const freeTier = this.model.tiers?.find((tier) => {
-            return tier.type === 'free';
-        });
-        options.isFreeChecked = freeTier?.visibility === 'public';
-        return this.membersUtils.getPortalPreviewUrl(options);
-    }),
-
-    showIconSetting: computed('selectedButtonStyle', function () {
-        const selectedButtonStyle = this.get('selectedButtonStyle.name') || '';
-        return selectedButtonStyle.includes('icon');
-    }),
-
-    showButtonTextSetting: computed('selectedButtonStyle', function () {
-        const selectedButtonStyle = this.get('selectedButtonStyle.name') || '';
-        return selectedButtonStyle.includes('text');
-    }),
-
-    selectedButtonStyle: computed('settings.portalButtonStyle', function () {
-        return this.buttonStyleOptions.find((buttonStyle) => {
-            return (buttonStyle.name === this.settings.portalButtonStyle);
-        });
-    }),
-
-    isFreeChecked: computed('settings.{portalPlans.[],membersSignupAccess}', function () {
-        const allowedPlans = this.settings.portalPlans || [];
-        return (this.settings.membersSignupAccess === 'all' && allowedPlans.includes('free'));
-    }),
-    isMonthlyChecked: computed('settings.portalPlans.[]', 'membersUtils.paidMembersEnabled', function () {
-        const allowedPlans = this.settings.portalPlans || [];
-        return (this.membersUtils.paidMembersEnabled && allowedPlans.includes('monthly'));
-    }),
-    isYearlyChecked: computed('settings.portalPlans.[]', 'membersUtils.paidMembersEnabled', function () {
-        const allowedPlans = this.settings.portalPlans || [];
-        return (this.membersUtils.paidMembersEnabled && allowedPlans.includes('yearly'));
-    }),
-    tiers: computed('model.tiers.[]', 'changedTiers.[]', 'isPreloading', function () {
-        const paidTiers = this.model.tiers?.filter(tier => tier.type === 'paid' && tier.active === true);
-        if (this.isPreloading || !paidTiers?.length) {
-            return [];
-        }
-
-        const tiers = paidTiers.map((tier) => {
-            return {
-                id: tier.id,
-                name: tier.name,
-                checked: tier.visibility === 'public'
-            };
-        });
-        return tiers;
-    }),
-
-    showPortalPrices: computed('tiers', function () {
-        const visibleTiers = this.model.tiers?.filter((tier) => {
-            return tier.visibility === 'public' && tier.type === 'paid';
-        });
-
-        return !!visibleTiers?.length;
-    }),
-
-    setTermsHtml: action((event) => {
-        this.settings.portalSignupTermsHtml = event.target.value;
-    }),
-
-    init() {
-        this._super(...arguments);
-        this.buttonStyleOptions = [
-            {name: 'icon-and-text', label: 'Icon and text'},
-            {name: 'icon-only', label: 'Icon only'},
-            {name: 'text-only', label: 'Text only'}
-        ];
-        this.availablePages = [{
-            name: 'signup',
-            label: 'Signup'
-        }, {
-            name: 'accountHome',
-            label: 'Account'
-        }, {
-            name: 'links',
-            label: 'Links'
-        }];
-        this.iconExtensions = ICON_EXTENSIONS;
-        this.changedTiers = [];
-        this.set('supportAddress', this.parseEmailAddress(this.settings.membersSupportAddress));
-        this.set('openSection', 'signup-options');
-    },
-
-    didInsertElement() {
-        this._super(...arguments);
-        this.settings.errors.clear();
-    },
-
-    actions: {
-        toggleFreePlan(isChecked) {
-            this.updateAllowedPlan('free', isChecked);
-        },
-        togglePlan(plan, event) {
-            this.updateAllowedPlan(plan, event.target.checked);
-        },
-        toggleTier(tierId, event) {
-            this.updateAllowedTier(tierId, event.target.checked);
-        },
-        togglePortalButton(showButton) {
-            this.settings.portalButton = showButton;
-        },
-
-        togglePortalName(showSignupName) {
-            this.settings.portalName = showSignupName;
-        },
-        toggleSection(section) {
-            if (this.get('openSection') === section) {
-                this.set('openSection', null);
-            } else {
-                this.set('openSection', section);
-            }
-        },
-
-        confirm() {
-            return this.saveTask.perform();
-        },
-
-        isPlanSelected(plan) {
-            const allowedPlans = this.settings.portalPlans;
-            return allowedPlans.includes(plan);
-        },
-
-        switchPreviewPage(page) {
-            if (page.name === 'links') {
-                this.set('showLinksPage', true);
-                this.set('page', '');
-            } else {
-                this.set('showLinksPage', false);
-                this.set('page', page.name);
-            }
-        },
-
-        switchToSignupPage() {
-            if (this.showLinksPage) {
-                this.set('showLinksPage', false);
-                this.set('page', 'signup');
-            }
-        },
-
-        setButtonStyle(buttonStyle) {
-            this.settings.portalButtonStyle = buttonStyle.name;
-        },
-
-        setSignupButtonText(event) {
-            this.settings.portalButtonSignupText = event.target.value;
-        },
-        /**
-         * Fired after an image upload completes
-         * @param  {string} property - Property name to be set on `this.settings`
-         * @param  {UploadResult[]} results - Array of UploadResult objects
-         * @return {string} The URL that was set on `this.settings.property`
-         */
-        imageUploaded(property, results) {
-            if (results[0]) {
-                this.set('customIcon', results[0].url);
-                this.settings.portalButtonIcon = results[0].url;
-            }
-        },
-        /**
-         * Opens a file selection dialog - Triggered by "Upload Image" buttons,
-         * searches for the hidden file input within the .gh-setting element
-         * containing the clicked button then simulates a click
-         * @param  {MouseEvent} event - MouseEvent fired by the button click
-         */
-        triggerFileDialog(event) {
-            event?.target.closest('.gh-setting-action')?.querySelector('input[type="file"]')?.click();
-        },
-
-        deleteCustomIcon() {
-            this.set('customIcon', null);
-            this.settings.portalButtonIcon = this.membersUtils.defaultIconKeys[0];
-        },
-
-        selectDefaultIcon(icon) {
-            this.settings.portalButtonIcon = icon;
-        },
-
-        closeLeaveSettingsModal() {
-            this.set('showLeaveSettingsModal', false);
-        },
-
-        openStripeConnect() {
-            this.isWaitingForStripeConnection = true;
-            this.model.openStripeConnect();
-        },
-
-        leaveSettings() {
-            this.closeModal();
-        },
-
-        validateFreeSignupRedirect() {
-            return this._validateSignupRedirect(this.freeSignupRedirect, 'membersFreeSignupRedirect');
-        },
-
-        validatePaidSignupRedirect() {
-            return this._validateSignupRedirect(this.paidSignupRedirect, 'membersPaidSignupRedirect');
-        },
-
-        setSupportAddress(supportAddress) {
-            this.set('supportAddress', supportAddress);
-
-            if (this.config.emailDomain && supportAddress === `noreply@${this.config.emailDomain}`) {
-                this.settings.membersSupportAddress = 'noreply';
-            } else {
-                this.settings.membersSupportAddress = supportAddress;
-            }
-        },
-
-        toggleSignupCheckboxRequired(checked) {
-            this.settings.portalSignupCheckboxRequired = checked;
-        },
-
-        validateTermsHtml() {
-            let content = this.settings.portalSignupTermsHtml ?? '';
-
-            // Strip HTML-tags and characters from content so we have a reliable character count
-            content = content.replace(/<[^>]*>?/gm, '');
-            content = content.replace(/&nbsp;/g, ' ');
-            content = content.replace(/&amp;/g, '&');
-            content = content.replace(/&quot;/g, '"');
-            content = content.replace(/&lt;/g, '<');
-            content = content.replace(/&gt;/g, '>');
-
-            this.settings.errors.remove('portalSignupTermsHtml');
-            this.settings.hasValidated.removeObject('portalSignupTermsHtml');
-
-            if (content.length > this.maxTermsLength) {
-                this.settings.errors.add('portalSignupTermsHtml', 'Signup notice is too long');
-                this.settings.hasValidated.pushObject('portalSignupTermsHtml');
-            }
-        }
-    },
-
-    parseEmailAddress(address) {
-        const emailAddress = address || 'noreply';
-        // Adds default domain as site domain
-        if (emailAddress.indexOf('@') < 0 && this.config.emailDomain) {
-            return `${emailAddress}@${this.config.emailDomain}`;
-        }
-        return emailAddress;
-    },
-
-    updateAllowedPlan(plan, isChecked) {
-        const portalPlans = this.settings.portalPlans || [];
-        const allowedPlans = [...portalPlans];
-        const freeTier = this.model.tiers.find(p => p.type === 'free');
-
-        if (!isChecked) {
-            this.settings.portalPlans = allowedPlans.filter(p => p !== plan);
-            if (plan === 'free') {
-                freeTier.set('visibility', 'none');
-            }
-        } else {
-            allowedPlans.push(plan);
-            this.settings.portalPlans = allowedPlans;
-            if (plan === 'free') {
-                freeTier.set('visibility', 'public');
-            }
-        }
-    },
-
-    updateAllowedTier(tierId, isChecked) {
-        const tier = this.model.tiers.find(p => p.id === tierId);
-        if (!isChecked) {
-            tier.set('visibility', 'none');
-        } else {
-            tier.set('visibility', 'public');
-        }
-        let portalTiers = this.model.tiers.filter((p) => {
-            return p.visibility === 'public';
-        }).map(p => p.id);
-        this.set('changedTiers', portalTiers);
-    },
-
-    _validateSignupRedirect(url, type) {
-        let errMessage = `Please enter a valid URL`;
-        this.settings.errors.remove(type);
-        this.settings.hasValidated.removeObject(type);
-
-        if (url === null) {
-            this.settings.errors.add(type, errMessage);
-            this.settings.hasValidated.pushObject(type);
-            return false;
-        }
-
-        if (url === undefined) {
-            // Not initialised
-            return;
-        }
-
-        if (url.href.startsWith(this.siteUrl)) {
-            const path = url.href.replace(this.siteUrl, '');
-            this.settings[type] = path;
-        } else {
-            this.settings[type] = url.href;
-        }
-    },
-
-    finishPreloading: action(async function () {
-        if (this.model.preloadTask?.isRunning) {
-            await this.model.preloadTask;
-        }
-
-        const portalButtonIcon = this.settings.portalButtonIcon || '';
-        if (portalButtonIcon && !this.membersUtils.defaultIconKeys.includes(portalButtonIcon)) {
-            this.set('customIcon', this.settings.portalButtonIcon);
-        }
-
-        this.siteUrl = this.config.blogUrl;
-        this.set('isPreloading', false);
-    }),
-
-    refreshAfterStripeConnected: action(async function () {
-        if (this.isWaitingForStripeConnection) {
-            await this.finishPreloading();
-            this.notifyPropertyChange('page'); // force preview url to recompute
-            this.set('portalPreviewGuid', Date.now().valueOf()); // force preview re-render
-            this.isWaitingForStripeConnection = false;
-        }
-    }),
-
-    copyLinkOrAttribute: task(function* () {
-        copyTextToClipboard(this.showModalLinkOrAttribute);
-        yield timeout(this.isTesting ? 50 : 3000);
-    }),
-
-    saveTask: task(function* () {
-        this.send('validateFreeSignupRedirect');
-        this.send('validatePaidSignupRedirect');
-        this.send('validateTermsHtml');
-
-        this.settings.errors.remove('members_support_address');
-        this.settings.hasValidated.removeObject('members_support_address');
-
-        if (this.settings.errors.length !== 0) {
-            return;
-        }
-
-        // Save tier visibility if changed
-        yield Promise.all(
-            this.model.tiers.filter((tier) => {
-                const changedAttrs = tier.changedAttributes();
-                return !!changedAttrs.visibility;
-            }).map((tier) => {
-                return tier.save();
-            })
-        );
-
-        const newEmail = this.settings.membersSupportAddress;
-
-        try {
-            const result = yield this.settings.save();
-            if (result._meta?.sent_email_verification) {
-                yield this.modals.open(ConfirmEmailModal, {
-                    newEmail,
-                    currentEmail: this.settings.membersSupportAddress
-                });
-            }
-
-            this.closeModal();
-        } catch (error) {
-            // Do we have an error that we can show inline?
-            if (error.payload && error.payload.errors) {
-                for (const payloadError of error.payload.errors) {
-                    if (payloadError.type === 'ValidationError' && payloadError.property && (payloadError.context || payloadError.message)) {
-                        // Context has a better error message for validation errors
-                        this.settings.errors.add(payloadError.property, payloadError.context || payloadError.message);
-                        this.settings.hasValidated.pushObject(payloadError.property);
-                    }
-                }
-            }
-            throw error;
-        }
-    }).drop()
-});
diff --git a/ghost/admin/app/components/modal-reset-all-passwords.hbs b/ghost/admin/app/components/modal-reset-all-passwords.hbs
deleted file mode 100644
index ccf060f8a4a..00000000000
--- a/ghost/admin/app/components/modal-reset-all-passwords.hbs
+++ /dev/null
@@ -1,25 +0,0 @@
-<header class="modal-header">
-    <h1>Reset all passwords</h1>
-</header>
-<a class="close" href="" role="button" title="Close" {{action "closeModal"}}>{{svg-jar "close"}}<span class="hidden">Close</span></a>
-
-<div class="modal-body gh-modal-reset-passwords">
-    <p>You're about to end all active staff user sessions and trigger a password reset for everyone (including yourself). Are you sure?</p>
-    <div class="flex mt2 mb2">
-        <div class="for-checkbox">
-            <label class="checkbox">
-                <input type="checkbox" checked={{this.isChecked}} {{on "click" (action "toggleCheckbox")}} class="gh-input" name="checkbox" data-test-checkbox="reset-all-passwords">
-                <span class="input-toggle-component"></span>
-            </label>
-        </div>
-        <div>
-            <h4>Yes, end sessions and reset passwords for all users.</h4>
-            <p class="description">Upon submission, you will be logged out. Please check your email to reset your password.</p>
-        </div>
-    </div>
-</div>
-
-<div class="modal-footer">
-    <button class="gh-btn" type="button" {{action "closeModal"}}><span>Cancel</span></button>
-    <GhTaskButton @buttonText="Reset Passwords" @task={{this.resetPasswords}} @class="gh-btn gh-btn-red gh-btn-icon" disabled={{this.isConfirmDisabled}} />
-</div>
diff --git a/ghost/admin/app/components/modal-reset-all-passwords.js b/ghost/admin/app/components/modal-reset-all-passwords.js
deleted file mode 100644
index 1c4d72f0a12..00000000000
--- a/ghost/admin/app/components/modal-reset-all-passwords.js
+++ /dev/null
@@ -1,46 +0,0 @@
-import ModalComponent from 'ghost-admin/components/modal-base';
-import {fetch} from 'fetch';
-import {not} from '@ember/object/computed';
-import {inject as service} from '@ember/service';
-import {set} from '@ember/object';
-import {task} from 'ember-concurrency';
-
-export default ModalComponent.extend({
-    notifications: service(),
-
-    isChecked: false,
-    isConfirmDisabled: not('isChecked'),
-
-    actions: {
-        toggleCheckbox() {
-            set(this, 'isChecked', !this.isChecked);
-        },
-        confirm() {
-            this.deletePost.perform();
-        }
-    },
-
-    async _resetPasswords() {
-        const res = await fetch('/ghost/api/admin/authentication/global_password_reset/', {
-            method: 'POST'
-        });
-        if (res.status < 200 || res.status >= 300) {
-            throw new Error('api failed ' + res.status + ' ' + res.statusText);
-        }
-    },
-
-    _failure(error) {
-        this.notifications.showAPIError(error, {key: 'user.resetAllPasswords.failed'});
-    },
-
-    resetPasswords: task(function* () {
-        try {
-            yield this._resetPasswords();
-            window.location = window.location.href.split('#')[0];
-        } catch (e) {
-            this._failure(e);
-        } finally {
-            this.send('closeModal');
-        }
-    }).drop()
-});
diff --git a/ghost/admin/app/components/modal-stripe-connect.hbs b/ghost/admin/app/components/modal-stripe-connect.hbs
deleted file mode 100644
index 4f95e6e56b4..00000000000
--- a/ghost/admin/app/components/modal-stripe-connect.hbs
+++ /dev/null
@@ -1,17 +0,0 @@
-<header class="modal-header" data-test-modal="webhook-form" {{will-destroy this.reset}}>
-    <h1 data-test-text="title">Connect with Stripe</h1>
-</header>
-<button class="close" href title="Close" type="button" {{on "click" this.closeModal}} {{on "mouseDown" (optional this.noop)}} data-test-button="close-stripe-connect">
-    {{svg-jar "close"}}
-</button>
-
-<form>
-<div class="modal-body" {{did-insert this.updateSuccessModifier}}>
-    <Settings::Members::StripeSettingsForm
-        @setStripeConnectIntegrationTokenSetting={{this.setStripeConnectIntegrationTokenSetting}}
-        @reset={{this.reset}}
-        @onConnected={{this.updateSuccessModifier}}
-        @onDisconnected={{this.updateSuccessModifier}}
-    />
-</div>
-</form>
diff --git a/ghost/admin/app/components/modal-stripe-connect.js b/ghost/admin/app/components/modal-stripe-connect.js
deleted file mode 100644
index db678db0877..00000000000
--- a/ghost/admin/app/components/modal-stripe-connect.js
+++ /dev/null
@@ -1,62 +0,0 @@
-import ModalBase from 'ghost-admin/components/modal-base';
-import classic from 'ember-classic-decorator';
-import {action} from '@ember/object';
-import {inject as service} from '@ember/service';
-
-// TODO: update modals to work fully with Glimmer components
-@classic
-export default class ModalStripeConnect extends ModalBase {
-    @service settings;
-    @service membersUtils;
-
-    @action
-    setStripeConnectIntegrationTokenSetting(stripeConnectIntegrationToken) {
-        this.settings.stripeConnectIntegrationToken = stripeConnectIntegrationToken;
-    }
-
-    @action
-    reset() {
-        // stripeConnectIntegrationToken is not a persisted value so we don't want
-        // to keep it around across transitions
-        this.settings.stripeConnectIntegrationToken = undefined;
-    }
-
-    @action
-    close(event) {
-        event?.preventDefault?.();
-        this.closeModal();
-    }
-
-    @action
-    confirmAction() {
-        this.confirm();
-        this.close();
-    }
-
-    @action
-    updateSuccessModifier() {
-        // Note, we should also check isStripeEnabled because stripeDirect option might be enabled
-        if (this.membersUtils.get('isStripeEnabled') && this.settings.stripeConnectAccountId) {
-            if (this.modifier?.indexOf('stripe-connected') === -1) {
-                this.updateModifier(`${this.modifier} stripe-connected`);
-            }
-        } else {
-            if (this.modifier?.indexOf('stripe-connected') !== -1) {
-                this.updateModifier(this.modifier.replace(/\s?stripe-connected/, ''));
-            }
-        }
-    }
-
-    actions = {
-        confirm() {
-            if (this.settings.stripeConnectAccountId) {
-                return this.confirmAction();
-            }
-            // noop - enter key shouldn't do anything
-        },
-        // needed because ModalBase uses .send() for keyboard events
-        closeModal() {
-            this.close();
-        }
-    };
-}
diff --git a/ghost/admin/app/components/modal-tier.hbs b/ghost/admin/app/components/modal-tier.hbs
deleted file mode 100644
index 5b329a03976..00000000000
--- a/ghost/admin/app/components/modal-tier.hbs
+++ /dev/null
@@ -1,325 +0,0 @@
-<button class="close" href title="Close" type="button" {{on "click" this.closeModal}}>
-    {{svg-jar "close"}}
-</button>
-
-<div class="gh-tier-modal-content" data-test-modal="edit-tier">
-    <header class="modal-header">
-        <h1 data-test-text="title">{{this.title}}</h1>
-    </header>
-
-    <form>
-    <div class="modal-body gh-form-edit-tier gh-tier-settings">
-        <div class="gh-main-section columns-3">
-            <div class="gh-main-section-block span-2">
-                <h4 class="gh-main-section-header small bn">Basic</h4>
-                <div class="gh-main-section-content grey gh-tier-priceform-block">
-                    {{#unless this.isFreeTier}}
-                        <GhFormGroup @errors={{this.tier.errors}} @hasValidated={{this.tier.hasValidated}} @property="name" data-test-formgroup="name">
-                            <label for="name" class="fw6">Name</label>
-                            <GhTextInput
-                                @value={{readonly this.tier.name}}
-                                @input={{action (mut this.tier.name) value="target.value"}}
-                                @name="name"
-                                @autofocus={{true}}
-                                @placeholder="Bronze"
-                                @id="name"
-                                @class="gh-input"
-                                data-test-input="tier-name" />
-                            <GhErrorMessage @errors={{this.tier.errors}} @property="name" />
-                        </GhFormGroup>
-                    {{/unless}}
-
-                    <GhFormGroup @errors={{this.tier.errors}} @property="description" data-test-formgroup="description">
-                        <label for="description" class="fw6">Description</label>
-                        {{#if this.isFreeTier}}
-                            <GhTextInput
-                                @value={{readonly this.tier.description}}
-                                @input={{action (mut this.tier.description) value="target.value"}}
-                                @name="description"
-                                @placeholder="Free preview of {{this.settings.title}}"
-                                @id="description"
-                                @class="gh-input"
-                                data-test-input="free-tier-description" />
-                        {{else}}
-                            <GhTextInput
-                                @value={{readonly this.tier.description}}
-                                @input={{action (mut this.tier.description) value="target.value"}}
-                                @name="description"
-                                @placeholder="Full access to premium content"
-                                @id="description"
-                                @class="gh-input"
-                                data-test-input="tier-description" />
-                        {{/if}}
-                        <GhErrorMessage @errors={{this.tier.errors}} @property="description" />
-                    </GhFormGroup>
-
-                    {{#unless this.isFreeTier}}
-                        <div class="gh-settings-members-pricetrialcont">
-                            <GhFormGroup @errors={{this.settings.errors}} @hasValidated={{this.settings.hasValidated}} @property="prices" data-test-formgroup="prices">
-                                <div class="gh-settings-members-pricelabelcont free-trial-enabled">
-                                    <label for="monthlyPrice" class="fw6">Prices</label>
-                                    <div>
-                                        <span class="gh-setting-members-currency gh-select">
-                                            <div class="gh-setting-members-currencylabel">
-                                                <span>{{this.currency}}</span>
-                                                {{svg-jar "arrow-down-small"}}
-                                            </div>
-                                            <OneWaySelect
-                                                @value={{this.selectedCurrency}}
-                                                id="currency"
-                                                name="currency"
-                                                @options={{readonly this.allCurrencies}}
-                                                @optionValuePath="value"
-                                                @optionLabelPath="label"
-                                                @update={{action "setCurrency"}}
-                                            />
-                                        </span>
-                                    </div>
-                                </div>
-                                <div class="gh-setting-members-prices free-trial-enabled">
-
-                                    <div class="gh-input-group">
-                                        <GhTextInput
-                                            @id="monthlyPrice"
-                                            @value={{readonly this.stripeMonthlyAmount}}
-                                            @type="number"
-                                            @input={{action (mut this.stripeMonthlyAmount) value="target.value"}}
-                                            @focus-out={{this.validateStripePlans}}
-                                            data-test-input="monthly-price"
-                                        />
-                                        <span class="gh-input-append"><span class="ttu">{{this.currency}}</span>/month</span>
-                                    </div>
-                                    <div class="gh-input-group">
-                                        <GhTextInput
-                                            @id="yearlyPrice"
-                                            @value={{readonly this.stripeYearlyAmount}}
-                                            @type="number"
-                                            @input={{action (mut this.stripeYearlyAmount) value="target.value"}}
-                                            @focus-out={{this.validateStripePlans}}
-                                            @placeholder=''
-                                            data-test-title-input={{true}}
-                                            data-test-input="yearly-price"
-                                        />
-                                        <span class="gh-input-append"><span class="ttu">{{this.currency}}</span>/year</span>
-                                    </div>
-                                </div>
-                                {{#if this.stripePlanError}}
-                                    <p class="response w-100"><span class="red">{{this.stripePlanError}}</span></p>
-                                {{/if}}
-                            </GhFormGroup>
-
-                            <GhFormGroup @errors={{this.tier.errors}} @property="trialDays" data-test-formgroup="trialDays">
-                                <div class="flex justify-between items-center mb2">
-                                    <div>
-                                        <h4 class="gh-tier-setting-title">Add a free trial</h4>
-                                    </div>
-                                    <div class="for-switch small">
-                                        <label class="switch" for="free-trial">
-                                            <Input
-                                                @checked={{this.freeTrialEnabled}}
-                                                @type="checkbox"
-                                                id="free-trial"
-                                                name="free-trial"
-                                                {{on "click" this.setFreeTrialEnabled}}
-                                            />
-                                            <span class="input-toggle-component" data-test-toggle="free-trial"></span>
-                                        </label>
-                                    </div>
-                                </div>
-
-                                <div class="gh-input-group {{unless this.freeTrialEnabled "gh-input-group-tier-trial-disabled"}}">
-                                    <GhTextInput
-                                            @value={{readonly this.tier.trialDays}}
-                                            @type="number"
-                                            {{on "input" this.setTrialDays}}
-                                            @name="trial"
-                                            @id="trial"
-                                            @class="gh-input"
-                                            @disabled={{unless this.freeTrialEnabled "true"}}
-                                            data-test-input="tier-trial" />
-                                            <span class="gh-input-append">days</span>
-                                </div>
-                                <p>Members will be subscribed at full price once the trial ends. <a class="trial-docs-link" href="https://ghost.org/help/free-trials">Learn more</a></p>
-                                {{#if this.hasTrialDaysError}}
-                                    <p class="response w-100"><span class="red">Free trial must be at least 1 day</span></p>
-                                {{/if}}
-                            </GhFormGroup>
-                        </div>
-
-                        <GhFormGroup>
-                            <label for="welcomePage" class="fw6">Welcome page</label>
-                            <GhUrlInput
-                                @id="welcomePage"
-                                @value={{readonly this.model.tier.welcomePageURL}}
-                                @baseUrl={{readonly this.siteUrl}}
-                                @setResult={{this.setWelcomePageURL}}
-                                @validateUrl={{this.validateWelcomePageURL}}
-                                @placeholder={{readonly this.siteUrl}}
-                            />
-                            {{#if this.isFreeTier}}
-                                <p>Redirect to this URL after signup for a free membership</p>
-                            {{else}}
-                                <p>Redirect to this URL after signup for premium membership</p>
-                            {{/if}}
-                        </GhFormGroup>
-                    {{/unless}}
-                </div>
-
-                <h4 class="gh-main-section-header small bn">Benefits</h4>
-                <div class="gh-main-section-content grey gh-tier-form-benefits">
-                    <div class="gh-tier-benefits">
-                        <div class="gh-blognav">
-                            <SortableObjects
-                                @sortableObjectList={{this.benefits}}
-                                @useSwap={{false}}
-                                @sortEndAction={{action "reorderItems"}}
-                            >
-                                {{#each this.benefits as |benefitItem index|}}
-                                    <DraggableObject @content={{benefitItem}} @dragHandle=".gh-blognav-grab" @isSortable={{true}}>
-                                        <GhBenefitItem
-                                            @benefitItem={{benefitItem}}
-                                            @addItem={{action "addBenefit"}}
-                                            @focusItem={{action "focusItem"}}
-                                            @deleteItem={{action "deleteBenefit"}}
-                                            @updateLabel={{action "updateLabel"}}
-                                            data-test-benefit-item={{index}} />
-                                    </DraggableObject>
-                                {{/each}}
-                            </SortableObjects>
-                            <GhBenefitItem
-                                @isFreeTier={{this.isFreeTier}}
-                                @benefitItem={{this.newBenefit}}
-                                @addItem={{action "addBenefit"}}
-                                @deleteItem={{action "deleteBenefit"}}
-                                @updateLabel={{action "updateLabel"}}
-                                data-test-benefit-item="new" />
-                        </div>
-                    </div>
-                </div>
-            </div>
-            <div class="gh-main-section-block gh-tier-form-tierpreview" data-test-tierpreview>
-                <div class="gh-tier-form-tierpreview-content">
-                    {{#if this.isFreeTier}}
-                        <h4 class="gh-main-section-header small bn" data-test-tierpreview-title>Free Membership Preview</h4>
-                    {{else}}
-                        <div class="gh-tier-form-tierpreivew-cadence">
-                            <h4 class="gh-main-section-header small bn" data-test-tierpreview-title>Tier Preview</h4>
-                            <div>
-                                <button class="gh-btn {{if (eq this.previewCadence "monthly") "selected"}}" type="button" {{on "click" (fn this.changeCadence "monthly")}}><span>Monthly</span></button>
-                                <button class="gh-btn {{if (eq this.previewCadence "yearly") "selected"}}" type="button" {{on "click" (fn this.changeCadence "yearly")}}><span>Yearly</span></button>
-                            </div>
-                        </div>
-                    {{/if}}
-                    <div class="gh-main-section-content">
-                        <div class="gh-portal-tier-card-header">
-                            {{#if this.tier.name}}
-                                <h4 class="gh-portal-tier-name" data-test-tierpreview-name style={{this.accentColorStyle}}>{{this.tier.name}}</h4>
-                            {{else}}
-                                <h4 class="placeholder gh-portal-tier-name" style={{this.accentColorStyle}} data-test-tierpreview-name>Bronze</h4>
-                            {{/if}}
-
-                            <div class="gh-portal-tier-card-pricecontainer" data-test-tierpreview-price>
-                                {{#if this.isFreeTier}}
-                                <div class="gh-portal-tier-price">
-                                    <span class="currency-sign">{{currency-symbol this.currency}}</span>
-                                    <span class="amount">0</span>
-                                </div>
-                                {{else}}
-                                    {{#if this.stripeYearlyAmount}}
-                                        <div class="gh-portal-tier-price">
-                                            <span class="currency-sign">{{currency-symbol this.currency}}</span>
-                                            {{#if (eq this.previewCadence "monthly")}}
-                                                <span class="amount">
-                                                    {{format-number this.stripeMonthlyAmount}}
-                                                </span>
-                                                <span class="billing-period">/month</span>
-                                            {{else}}
-                                                <span class="amount">
-                                                    {{format-number this.stripeYearlyAmount}}
-                                                </span>
-                                                <span class="billing-period">/year</span>
-                                            {{/if}}
-                                        </div>
-                                            {{#if this.isFreeTrialEnabled}}
-                                            <span class="gh-portal-discount-label">
-                                                <span style="background-color: {{this.settings.accentColor}}"></span>
-                                                {{ this.tier.trialDays }} days free</span>
-                                            {{/if}}
-                                    {{else}}
-                                        <div class="gh-portal-tier-price placeholder">
-                                            <span class="currency-sign">{{currency-symbol this.currency}}</span>
-                                            <span class="amount">0</span>
-                                            <span class="billing-period">/year</span>
-                                        </div>
-                                    {{/if}}
-                                {{/if}}
-                            </div>
-                                {{#if (and (eq this.previewCadence "yearly") (gt this.discountValue 0))}}
-                                <span class="gh-portal-discount-label-trial" style={{this.accentColorStyle}}>
-                                    {{this.discountValue}}% discount
-                                </span>
-                                {{/if}}
-                        </div>
-
-                        <div class="gh-portal-tier-card-details">
-                            <div class="gh-portal-tier-card-detaildata">
-                                {{#if this.tier.description}}
-                                    <div class="gh-portal-tier-description" data-test-tierpreview-description>{{this.tier.description}}</div>
-                                {{else}}
-                                    {{#if this.isFreeTier}}
-                                        <div class="placeholder gh-portal-tier-description" data-test-tierpreview-description>Free preview of {{this.settings.title}}</div>
-                                    {{else}}
-                                        <div class="placeholder gh-portal-tier-description" data-test-tierpreview-description>Full access to premium content</div>
-                                    {{/if}}
-                                {{/if}}
-
-                                {{#if this.benefits}}
-                                    <div class="gh-portal-tier-benefits" data-test-tierpreview-benefits>
-                                    {{#each this.benefits as |benefitItem|}}
-                                        <div class="gh-portal-tier-benefit">{{svg-jar "check-2"}}
-                                            <div class="gh-portal-benefit-title">{{benefitItem.name}}</div>
-                                        </div>
-                                    {{/each}}
-                                    </div>
-                                {{else}}
-                                    <div class="placeholder gh-portal-tier-benefits" data-test-tierpreview-benefits>
-                                        {{#if this.isFreeTier}}
-                                            <div class="gh-portal-tier-benefit">{{svg-jar "check-2"}}
-                                                <div class="gh-portal-benefit-title">
-                                                    Access to all public posts
-                                                </div>
-                                            </div>
-                                        {{else}}
-                                            <div class="gh-portal-tier-benefit">
-                                                {{svg-jar "check-2"}}
-                                                <div class="gh-portal-benefit-title">Expert analysis</div>
-                                            </div>
-                                        {{/if}}
-                                    </div>
-                                {{/if}}
-                            </div>
-                        </div>
-
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-    </form>
-</div>
-
-<div class="modal-footer top-shadow items-center">
-    <button
-        class="gh-btn" data-test-button="cancel-webhook" type="button" {{action "closeModal"}}
-        {{!-- disable mouseDown so it doesn't trigger focus-out validations --}}
-        {{action (optional this.noop) on="mouseDown"}}
-    >
-        <span>Cancel</span>
-    </button>
-    <GhTaskButton @buttonText="{{if this.isExistingTier "Save" "Add tier"}}"
-        @successText={{this.successText}}
-        @task={{this.saveTier}}
-        @idleClass="gh-btn-primary"
-        @class="gh-btn {{if this.isExistingTier "gh-btn-black" "gh-btn-green"}} gh-btn-icon"
-        data-test-button="save-tier" />
-</div>
diff --git a/ghost/admin/app/components/modal-tier.js b/ghost/admin/app/components/modal-tier.js
deleted file mode 100644
index f8523630156..00000000000
--- a/ghost/admin/app/components/modal-tier.js
+++ /dev/null
@@ -1,336 +0,0 @@
-import ModalBase from 'ghost-admin/components/modal-base';
-import TierBenefitItem from '../models/tier-benefit-item';
-import classic from 'ember-classic-decorator';
-import {action} from '@ember/object';
-import {currencies, getCurrencyOptions, getSymbol, minimumAmountForCurrency} from 'ghost-admin/utils/currency';
-import {A as emberA} from '@ember/array';
-import {htmlSafe} from '@ember/template';
-import {inject} from 'ghost-admin/decorators/inject';
-import {run} from '@ember/runloop';
-import {inject as service} from '@ember/service';
-import {task} from 'ember-concurrency';
-import {tracked} from '@glimmer/tracking';
-
-const CURRENCIES = currencies.map((currency) => {
-    return {
-        value: currency.isoCode.toLowerCase(),
-        label: `${currency.isoCode} - ${currency.name}`,
-        isoCode: currency.isoCode
-    };
-});
-
-// Stripe has an upper amount limit of 999,999.99
-// See https://stripe.com/docs/api/payment_intents/object#payment_intent_object-amount
-const MAX_AMOUNT = 999_999.99;
-
-// TODO: update modals to work fully with Glimmer components
-@classic
-export default class ModalTierPrice extends ModalBase {
-    @service feature;
-    @service settings;
-    @service membersUtils;
-
-    @inject config;
-
-    @tracked model;
-    @tracked tier;
-    @tracked periodVal;
-    @tracked stripeMonthlyAmount = 5;
-    @tracked stripeYearlyAmount = 50;
-    @tracked currency = 'usd';
-    @tracked stripePlanError = '';
-    @tracked benefits = emberA([]);
-    @tracked newBenefit = null;
-    @tracked welcomePageURL;
-    @tracked previewCadence = 'yearly';
-    @tracked discountValue = 0;
-    @tracked hasSaved = false;
-    @tracked freeTrialEnabled = false;
-    @tracked savedBenefits;
-
-    accentColorStyle = '';
-
-    confirm() {}
-
-    get isFreeTier() {
-        return this.tier.type === 'free';
-    }
-
-    get hasTrialDaysError() {
-        const trialDays = this.tier.get('trialDays');
-        return this.freeTrialEnabled && (!trialDays || trialDays < 1);
-    }
-
-    get allCurrencies() {
-        return getCurrencyOptions();
-    }
-
-    get selectedCurrency() {
-        return CURRENCIES.findBy('value', this.currency);
-    }
-
-    get isFreeTrialEnabled() {
-        return this.freeTrialEnabled && this.tier.get('trialDays') > 0;
-    }
-
-    init() {
-        super.init(...arguments);
-        this.tier = this.model.tier;
-        this.savedBenefits = this.model.tier?.get('benefits');
-        const monthlyPrice = this.tier.get('monthlyPrice');
-        const yearlyPrice = this.tier.get('yearlyPrice');
-        if (monthlyPrice) {
-            this.stripeMonthlyAmount = (monthlyPrice / 100);
-        }
-        if (yearlyPrice) {
-            this.stripeYearlyAmount = (yearlyPrice / 100);
-        }
-        this.currency = this.tier.get('currency') || 'usd';
-        this.benefits = this.tier.get('benefits') || emberA([]);
-        this.newBenefit = TierBenefitItem.create({
-            isNew: true,
-            name: ''
-        });
-        this.calculateDiscount();
-        if (this.tier.get('trialDays')) {
-            this.freeTrialEnabled = true;
-        }
-        this.accentColorStyle = htmlSafe(`color: ${this.settings.accentColor}`);
-    }
-
-    @action
-    validateWelcomePageURL() {
-        const siteUrl = this.siteUrl;
-
-        if (this.welcomePageURL === undefined) {
-            // Not initialised
-            return;
-        }
-
-        if (this.welcomePageURL.href.startsWith(siteUrl)) {
-            const path = this.welcomePageURL.href.replace(siteUrl, '');
-            this.model.tier.welcomePageURL = path;
-        } else {
-            this.model.tier.welcomePageURL = this.welcomePageURL.href;
-        }
-    }
-
-    get siteUrl() {
-        return this.config.blogUrl;
-    }
-
-    // eslint-disable-next-line no-dupe-class-members
-    get welcomePageURL() {
-        return this.model.tier.welcomePageURL;
-    }
-
-    get title() {
-        if (this.isExistingTier) {
-            if (this.isFreeTier) {
-                return `Edit free membership`;
-            }
-            return `Edit tier`;
-        }
-        return 'New tier';
-    }
-
-    get isExistingTier() {
-        return !this.model.tier.isNew;
-    }
-
-    @action
-    close(event) {
-        if (!this.hasSaved) {
-            this.reset();
-        }
-        event?.preventDefault?.();
-        this.closeModal();
-    }
-    @action
-    setCurrency(event) {
-        const newCurrency = event.value;
-        this.currency = newCurrency;
-    }
-    @action
-    setWelcomePageURL(url) {
-        this.welcomePageURL = url;
-    }
-
-    reset() {
-        this.newBenefit = TierBenefitItem.create({isNew: true, name: ''});
-        const finalBenefits = this.savedBenefits || emberA([]);
-        this.tier.set('benefits', finalBenefits);
-        this.tier.rollbackAttributes();
-    }
-
-    @task({drop: true})
-    *saveTier() {
-        this.validatePrices();
-
-        if (this.stripePlanError || this.hasTrialDaysError) {
-            return;
-        }
-
-        if (!this.newBenefit.get('isBlank')) {
-            yield this.send('addBenefit', this.newBenefit);
-        }
-
-        if (!this.isFreeTier) {
-            const monthlyAmount = Math.round(this.stripeMonthlyAmount * 100);
-            const yearlyAmount = Math.round(this.stripeYearlyAmount * 100);
-            this.tier.set('monthlyPrice', monthlyAmount);
-            this.tier.set('yearlyPrice', yearlyAmount);
-            this.tier.set('currency', this.currency);
-        }
-
-        if (!this.freeTrialEnabled) {
-            this.tier.set('trialDays', 0);
-        }
-
-        this.tier.set('benefits', this.benefits.filter(benefit => !benefit.get('isBlank')));
-
-        try {
-            yield this.tier.save();
-            this.hasSaved = true;
-            yield this.confirm();
-            this.send('closeModal');
-
-            // Reload in the background (no await here)
-            this.membersUtils.reload();
-        } catch (error) {
-            if (error === undefined) {
-                // Validation error
-                return;
-            }
-
-            throw error;
-        }
-    }
-
-    validatePrices() {
-        this.stripePlanError = undefined;
-
-        try {
-            const yearlyAmount = this.stripeYearlyAmount;
-            const monthlyAmount = this.stripeMonthlyAmount;
-            const symbol = getSymbol(this.currency);
-            const minimumAmount = minimumAmountForCurrency(this.currency);
-
-            if (!yearlyAmount || (yearlyAmount < minimumAmount) || !monthlyAmount || (monthlyAmount < minimumAmount)) {
-                throw new TypeError(`Subscription amount cannot be less than ${symbol}${minimumAmount}`);
-            }
-
-            if (yearlyAmount > MAX_AMOUNT || monthlyAmount > MAX_AMOUNT) {
-                throw new TypeError(`Subscription amount cannot be more than ${symbol}${MAX_AMOUNT}`);
-            }
-        } catch (err) {
-            this.stripePlanError = err.message;
-        }
-    }
-
-    addNewBenefitItem(item) {
-        item.set('isNew', false);
-        this.benefits.pushObject(item);
-
-        this.newBenefit = TierBenefitItem.create({isNew: true, name: ''});
-    }
-
-    calculateDiscount() {
-        const discount = this.stripeMonthlyAmount ? 100 - Math.floor((this.stripeYearlyAmount / 12 * 100) / this.stripeMonthlyAmount) : 0;
-        this.discountValue = discount > 0 ? discount : 0;
-    }
-
-    @action
-    changeCadence(cadence) {
-        this.previewCadence = cadence;
-    }
-
-    @action
-    setTrialDays(event) {
-        const value = parseInt(event.target.value);
-        this.tier.set('trialDays', value);
-    }
-
-    @action
-    setFreeTrialEnabled(event) {
-        this.freeTrialEnabled = event.target.checked;
-        if (event.target.checked && !this.tier.get('trialDays')) {
-            this.tier.set('trialDays', 7);
-        }
-    }
-
-    @action
-    validateStripePlans() {
-        this.calculateDiscount();
-        this.stripePlanError = undefined;
-
-        try {
-            const yearlyAmount = this.stripeYearlyAmount;
-            const monthlyAmount = this.stripeMonthlyAmount;
-            const symbol = getSymbol(this.currency);
-            const minimumAmount = minimumAmountForCurrency(this.currency);
-
-            if (!yearlyAmount || (yearlyAmount < minimumAmount) || !monthlyAmount || (monthlyAmount < minimumAmount)) {
-                throw new TypeError(`Subscription amount cannot be less than ${symbol}${minimumAmount}`);
-            }
-
-            if (yearlyAmount > MAX_AMOUNT || monthlyAmount > MAX_AMOUNT) {
-                throw new TypeError(`Subscription amount cannot be more than ${symbol}${MAX_AMOUNT}`);
-            }
-        } catch (err) {
-            this.stripePlanError = err.message;
-        }
-    }
-
-    actions = {
-        addBenefit(item) {
-            return item.validate().then(() => {
-                this.addNewBenefitItem(item);
-            });
-        },
-        focusItem() {
-            // Focus on next benefit on enter
-        },
-        deleteBenefit(item) {
-            if (!item) {
-                return;
-            }
-            this.benefits.removeObject(item);
-        },
-        reorderItems() {
-            this.tier.set('benefits', this.benefits);
-        },
-        updateLabel(label, benefitItem) {
-            if (!benefitItem) {
-                return;
-            }
-
-            if (benefitItem.get('name') !== label) {
-                benefitItem.set('name', label);
-            }
-        },
-        // noop - we don't want the enter key doing anything
-        confirm() {},
-        setAmount(amount) {
-            this.price.amount = !isNaN(amount) ? parseInt(amount) : 0;
-        },
-
-        setCurrency(event) {
-            const newCurrency = event.value;
-            this.currency = newCurrency;
-        },
-
-        // needed because ModalBase uses .send() for keyboard events
-        closeModal() {
-            this.close();
-        }
-    };
-
-    keyPress(event) {
-        // enter key
-        if (event.keyCode === 13) {
-            event.preventDefault();
-            run.scheduleOnce('actions', this, this.send, 'addBenefit', this.newBenefit);
-        }
-    }
-}
diff --git a/ghost/admin/app/components/modals/design/confirm-delete-theme.hbs b/ghost/admin/app/components/modals/design/confirm-delete-theme.hbs
deleted file mode 100644
index 28d10550485..00000000000
--- a/ghost/admin/app/components/modals/design/confirm-delete-theme.hbs
+++ /dev/null
@@ -1,20 +0,0 @@
-<div class="modal-content" {{on-key "Enter" (perform this.deleteThemeTask)}} data-test-modal="delete-theme">
-    <header class="modal-header">
-        <h1>Are you sure you want to delete this?</h1>
-    </header>
-    <button type="button" class="close" title="Close" {{on "click" @close}}>{{svg-jar "close"}}<span class="hidden">Close</span></button>
-
-    <div class="modal-body">
-        <p>You're about to delete "<strong>{{@data.theme.name}}</strong>". This is permanent! We warned you, k? Maybe <a href="#" {{on "click" this.downloadTheme}}>download your theme before continuing</a></p>
-    </div>
-
-    <div class="modal-footer">
-        <button class="gh-btn" data-test-button="cancel" type="button" {{on "click" (fn @close false)}}><span>Stay</span></button>
-        <GhTaskButton
-            @buttonText="Delete"
-            @successText="Deleted"
-            @task={{this.deleteThemeTask}}
-            @class="gh-btn gh-btn-red gh-btn-icon"
-            data-test-button="confirm" />
-    </div>
-</div>
\ No newline at end of file
diff --git a/ghost/admin/app/components/modals/design/confirm-delete-theme.js b/ghost/admin/app/components/modals/design/confirm-delete-theme.js
deleted file mode 100644
index f0d4854e2b1..00000000000
--- a/ghost/admin/app/components/modals/design/confirm-delete-theme.js
+++ /dev/null
@@ -1,31 +0,0 @@
-import Component from '@glimmer/component';
-import {action} from '@ember/object';
-import {inject as service} from '@ember/service';
-import {task} from 'ember-concurrency';
-
-export default class ConfirmDeleteThemeModal extends Component {
-    @service ghostPaths;
-    @service notifications;
-    @service utils;
-
-    @action
-    downloadTheme(event) {
-        event.preventDefault();
-        this.utils.downloadFile(`${this.ghostPaths.apiRoot}/themes/${this.args.data.theme.name}/download/`);
-    }
-
-    @task
-    *deleteThemeTask() {
-        try {
-            yield this.args.data.theme.destroyRecord();
-            // we need to unload from the store here so that uploading another
-            // theme with the same "id" doesn't attempt to update the deleted record
-            this.args.data.theme.unloadRecord();
-            this.args.close();
-            return true;
-        } catch (error) {
-            // TODO: show error in modal rather than generic message
-            this.notifications.showAPIError(error);
-        }
-    }
-}
diff --git a/ghost/admin/app/components/modals/design/install-theme.hbs b/ghost/admin/app/components/modals/design/install-theme.hbs
deleted file mode 100644
index 30cfe550cab..00000000000
--- a/ghost/admin/app/components/modals/design/install-theme.hbs
+++ /dev/null
@@ -1,107 +0,0 @@
-<div class="modal-content" data-test-modal="install-theme">
-    <div class="theme-validation-container">
-        <header class="modal-header">
-            <h1>{{if this.installSuccess "Success" "Install theme"}}</h1>
-        </header>
-        <button type="button" class="close" title="Close" {{on "click" @close}}>{{svg-jar "close"}}<span class="hidden">Close</span></button>
-
-        <div class="modal-body">
-            {{#if this.isConfirming}}
-                <p data-test-state="confirm">
-                    By clicking below, <strong>{{this.themeName}}</strong> will automatically be activated as the theme for your site.
-                </p>
-
-                {{#if this.willOverwriteExisting}}
-                    <p data-test-state="confirm-overwrite">
-                        This will overwrite your existing version of {{this.themeName}}{{if this.willOverwriteExisting.active ", which is your active theme"}}. All custom changes will be lost.
-                    </p>
-                {{/if}}
-            {{/if}}
-
-            {{#if this.installSuccess}}
-                {{#if this.hasWarningsOrErrors}}
-                    <p data-test-state="installed-with-notes">
-                        The theme <strong>"{{this.themeName}}"</strong> was installed successfully but we detected some {{if this.validationErrors "errors" "warnings"}}.
-                    </p>
-                {{else}}
-                    {{!-- Installed with no errors --}}
-                    <p data-test-state="installed-no-notes"><strong>{{this.themeName}}</strong> has been successfully installed and activated as your theme.</p>
-                {{/if}}
-            {{/if}}
-
-            {{#if this.installError}}
-                {{!-- Outright failure - not found, not a theme, server error, etc --}}
-                <p data-test-state="failed-error">{{this.themeName}} failed to install.</p>
-                <p class="error" data-test-text="install-error"><strong class="response">{{this.installError}}</strong></p>
-            {{/if}}
-
-            {{#if this.installFailure}}
-                {{!-- Invalid theme --}}
-                <p data-test-state="failed-invalid">This theme is invalid and cannot be installed. Contact the theme developer.</p>
-            {{/if}}
-
-            {{#if this.fatalValidationErrors}}
-                <div>
-                    <h2 class="mb0 mt4 f5 fw6">Fatal Errors</h2>
-                    <p class="mb2">Must-fix to install theme</p>
-                </div>
-
-                <ul class="pa0">
-                {{#each this.fatalValidationErrors as |error|}}
-                    <li class="theme-validation-item theme-fatal-error">
-                        <GhThemeErrorLi @error={{error}} />
-                    </li>
-                {{/each}}
-                </ul>
-            {{/if}}
-
-            {{#if this.validationErrors}}
-                <div>
-                    <h2 class="mb0 mt4 f5 fw6">Errors</h2>
-                    <p class="mb2">Highly recommended to fix, functionality <strong>could</strong> be restricted</p>
-                </div>
-                <ul class="pa0">
-                {{#each this.validationErrors as |error|}}
-                    <li class="theme-validation-item theme-error">
-                        <GhThemeErrorLi @error={{error}} />
-                    </li>
-                {{/each}}
-                </ul>
-            {{/if}}
-
-            {{#if this.validationWarnings}}
-                <div>
-                    <h2 class="mb0 mt4 f5 fw6">Warnings</h2>
-                </div>
-                <ul class="pa0">
-                {{#each this.validationWarnings as |error|}}
-                    <li class="theme-validation-item theme-warning">
-                        <GhThemeErrorLi @error={{error}} />
-                    </li>
-                {{/each}}
-                </ul>
-            {{/if}}
-        </div>
-
-        <div class="modal-footer">
-            <div class="flex items-center justify-between">
-                <button class="gh-btn" data-test-button="cancel" type="button" {{on "click" (fn @close false)}}>
-                    <span>{{if (or this.installSuccess this.installFailure) "Close" "Cancel"}}</span>
-                </button>
-
-                {{#if this.shouldShowInstall}}
-                    <GhTaskButton
-                        @disabled={{this.refreshThemesTask.isRunning}}
-                        @buttonText={{if this.willOverwriteExisting "Overwrite" "Install"}}
-                        @runningText="Installing"
-                        @successText="Installed"
-                        @task={{this.installThemeTask}}
-                        @unlinkedTask={{true}} {{!-- button will be removed on success so avoid self-cancel warning --}}
-                        @class="gh-btn gh-btn-primary gh-btn-icon"
-                        data-test-button="confirm-install"
-                    />
-                {{/if}}
-            </div>
-        </div>
-    </div>
-</div>
\ No newline at end of file
diff --git a/ghost/admin/app/components/modals/design/install-theme.js b/ghost/admin/app/components/modals/design/install-theme.js
deleted file mode 100644
index dc23b174e8a..00000000000
--- a/ghost/admin/app/components/modals/design/install-theme.js
+++ /dev/null
@@ -1,141 +0,0 @@
-import Component from '@glimmer/component';
-import {isThemeValidationError} from 'ghost-admin/services/ajax';
-import {inject as service} from '@ember/service';
-import {task} from 'ember-concurrency';
-import {tracked} from '@glimmer/tracking';
-
-export default class InstallThemeModal extends Component {
-    @service ajax;
-    @service ghostPaths;
-    @service store;
-    @service themeManagement;
-
-    @tracked installedTheme = null;
-    @tracked installError = '';
-    @tracked validationWarnings = [];
-    @tracked validationErrors = [];
-    @tracked fatalValidationErrors = [];
-
-    themes = this.store.peekAll('theme');
-
-    constructor() {
-        super(...arguments);
-        this.refreshThemesTask.perform();
-    }
-
-    get themeName() {
-        return this.args.data.theme?.name || this.args.data.ref.split('/')[1];
-    }
-
-    get themeRef() {
-        return this.args.data.theme?.ref || this.args.data.ref;
-    }
-
-    get isDefaultOrLegacyTheme() {
-        return this.themeName.toLowerCase() === 'casper' || this.themeName.toLowerCase() === 'source';
-    }
-
-    get isConfirming() {
-        return !this.installSuccess && !this.installError && !this.installFailure;
-    }
-
-    get installSuccess() {
-        return !!this.installedTheme;
-    }
-
-    get installFailure() {
-        return !this.installSuccess && (this.validationErrors.length || this.fatalValidationErrors.length);
-    }
-
-    get willOverwriteExisting() {
-        return !this.isDefaultOrLegacyTheme && this.themes.findBy('name', this.themeName.toLowerCase());
-    }
-
-    get hasWarningsOrErrors() {
-        return this.validationWarnings.length > 0 || this.validationErrors.length > 0;
-    }
-
-    get shouldShowInstall() {
-        return !this.installSuccess && !this.installFailure;
-    }
-
-    @task
-    *refreshThemesTask() {
-        yield this.store.findAll('theme', {reload: true});
-    }
-
-    @task
-    *installThemeTask() {
-        try {
-            if (this.isDefaultOrLegacyTheme) {
-                // default theme can't be installed, only activated
-                const themeName = this.themeName.toLowerCase();
-                const defaultTheme = this.store.peekRecord('theme', themeName);
-                yield this.themeManagement.activateTask.perform(defaultTheme, {skipErrors: true});
-                this.installedTheme = defaultTheme;
-
-                // let modal opener do any other background stuff
-                this.args.data.onSuccess?.();
-
-                return true;
-            }
-
-            const url = this.ghostPaths.url.api('themes/install') + `?source=github&ref=${this.themeRef}`;
-            const result = yield this.ajax.post(url);
-
-            this.installError = '';
-
-            if (result.themes) {
-                // show theme in list immediately
-                this.store.pushPayload(result);
-
-                this.installedTheme = this.store.peekRecord('theme', result.themes[0].name);
-
-                this.validationWarnings = this.installedTheme.warnings || [];
-                this.validationErrors = this.installedTheme.gscanErrors || [];
-                this.fatalValidationErrors = [];
-
-                // activate but prevent additional error modal from showing
-                yield this.themeManagement.activateTask.perform(this.installedTheme, {skipErrors: true});
-
-                // let modal opener do any other background stuff
-                this.args.data.onSuccess?.();
-
-                return true;
-            }
-        } catch (error) {
-            if (isThemeValidationError(error)) {
-                this.resetErrors();
-
-                let errors = error.payload.errors[0].details.errors;
-                let fatalErrors = [];
-                let normalErrors = [];
-
-                // to have a proper grouping of fatal errors and none fatal, we need to check
-                // our errors for the fatal property
-                if (errors && errors.length > 0) {
-                    for (let i = 0; i < errors.length; i += 1) {
-                        if (errors[i].fatal) {
-                            fatalErrors.push(errors[i]);
-                        } else {
-                            normalErrors.push(errors[i]);
-                        }
-                    }
-                }
-
-                this.fatalValidationErrors = fatalErrors;
-                this.validationErrors = normalErrors;
-                this.validationWarnings = error.payload.errors[0].details.warnings || [];
-                return false;
-            }
-
-            if (error.payload?.errors) {
-                this.installError = error.payload.errors[0].message;
-                return false;
-            }
-
-            this.installError = error.message;
-            throw error;
-        }
-    }
-}
diff --git a/ghost/admin/app/components/modals/design/upload-theme.hbs b/ghost/admin/app/components/modals/design/upload-theme.hbs
deleted file mode 100644
index ade36203c26..00000000000
--- a/ghost/admin/app/components/modals/design/upload-theme.hbs
+++ /dev/null
@@ -1,153 +0,0 @@
-<div class="modal-content" data-test-modal="upload-theme">
-    <div class="theme-validation-container">
-        <header class="modal-header">
-            <h1>
-                {{#if this.theme}}
-                    {{#if this.hasWarningsOrErrors}}
-                        Upload successful with {{#if this.validationErrors}}errors{{else}}warnings{{/if}}
-                    {{else}}
-                        Upload successful!
-                    {{/if}}
-                {{else if (or this.validationErrors this.fatalValidationErrors)}}
-                    Invalid theme
-                {{else}}
-                    Upload a theme
-                {{/if}}
-            </h1>
-        </header>
-        <button type="button" class="close" title="Close" {{on "click" @close}}>{{svg-jar "close"}}<span class="hidden">Close</span></button>
-
-        <div class="modal-body">
-            {{#if this.theme}}
-                {{#if this.hasWarningsOrErrors}}
-                    <p data-test-state="installed-with-notes">
-                        The theme <strong>"{{this.themeName}}"</strong> was installed successfully but we detected some {{if this.validationErrors "errors" "warnings"}}.
-                        {{#if this.canActivateTheme}}
-                            You are still able to activate and use the theme but it is recommended to fix these {{if this.validationErrors "errors" "warnings"}} before you do so.
-                        {{/if}}
-                    </p>
-
-                    {{#if this.validationErrors}}
-                        <div>
-                            <h2 class="mb0 mt4 f5 fw6">Errors</h2>
-                            <p class="mb2">Highly recommended to fix, functionality <strong>could</strong> be restricted</p>
-                        </div>
-                        <ul class="pa0">
-                        {{#each this.validationErrors as |error|}}
-                            <li class="theme-validation-item theme-error">
-                                <GhThemeErrorLi @error={{error}} />
-                            </li>
-                        {{/each}}
-                        </ul>
-                    {{/if}}
-
-                    {{#if this.validationWarnings}}
-                        <div>
-                            <h2 class="mb0 mt4 f5 fw6">Warnings</h2>
-                        </div>
-                        <ul class="pa0">
-                        {{#each this.validationWarnings as |error|}}
-                            <li class="theme-validation-item theme-warning">
-                                <GhThemeErrorLi @error={{error}} />
-                            </li>
-                        {{/each}}
-                        </ul>
-                    {{/if}}
-                {{else}}
-                    <p data-test-state="installed-no-notes">
-                        <strong>{{this.themeName}}</strong> uploaded successfully.
-                        {{#if this.canActivateTheme}}Do you want to activate it now?{{/if}}
-                    </p>
-                {{/if}}
-            {{else if this.displayOverwriteWarning}}
-                <p data-test-state="overwrite">
-                    The theme <strong>"{{this.fileThemeName}}"</strong> already exists. Do you want to overwrite it?
-                </p>
-            {{else if (or this.validationErrors this.fatalValidationErrors)}}
-
-                <p data-test-state="invalid">
-                    This theme is invalid and cannot be activated. Fix the following errors and re-upload the theme.
-                </p>
-
-                {{#if this.fatalValidationErrors}}
-                    <div>
-                        <h2 class="mb0 mt4 f5 fw6">Fatal Errors</h2>
-                        <p class="mb2">Must-fix to activate theme</p>
-                    </div>
-
-                    <ul class="pa0">
-                    {{#each this.fatalValidationErrors as |error|}}
-                        <li class="theme-validation-item theme-fatal-error">
-                            <GhThemeErrorLi @error={{error}} />
-                        </li>
-                    {{/each}}
-                    </ul>
-                {{/if}}
-
-                {{#if this.validationErrors}}
-                    <div>
-                        <h2 class="mb0 mt4 f5 fw6">Errors</h2>
-                        <p class="mb2">Highly recommended to fix, functionality <strong>could</strong> be restricted</p>
-                    </div>
-                    <ul class="pa0">
-                    {{#each this.validationErrors as |error|}}
-                        <li class="theme-validation-item theme-error">
-                            <GhThemeErrorLi @error={{error}} />
-                        </li>
-                    {{/each}}
-                    </ul>
-                {{/if}}
-
-                {{#if this.validationWarnings}}
-                    <div>
-                        <h2 class="mb0 mt4 f5 fw6">Warnings</h2>
-                    </div>
-                    <ul class="pa0">
-                    {{#each this.validationWarnings as |error|}}
-                        <li class="theme-validation-item theme-warning">
-                            <GhThemeErrorLi @error={{error}} />
-                        </li>
-                    {{/each}}
-                    </ul>
-                {{/if}}
-            {{else}}
-                <GhFileUploader
-                    @url={{this.uploadUrl}}
-                    @paramName="file"
-                    @accept={{this.accept}}
-                    @labelText="Select or drop your theme zip file"
-                    @validate={{this.validateTheme}}
-                    @uploadStarted={{fn (mut this.themeManagement.isUploading) true}}
-                    @uploadFinished={{fn (mut this.themeManagement.isUploading) false}}
-                    @uploadSuccess={{this.uploadSuccess}}
-                    @uploadFailed={{this.uploadFailed}}
-                    @listenTo="themeUploader" />
-            {{/if}}
-        </div>
-    </div>
-
-    <div class="modal-footer {{if (and this.theme this.hasWarningsOrErrors) "top-shadow"}}">
-        <div class="flex items-center justify-between {{if (or this.displayOverwriteWarning this.canActivateTheme this.validationErrors this.fatalValidationErrors) "flex-auto"}}">
-            <button type="button" {{on "click" @close}} disabled={{this.closeDisabled}} class="gh-btn" data-test-button="cancel">
-                <span>{{#if this.theme}}Close{{else}}Cancel{{/if}}</span>
-            </button>
-            <div class="flex items-center">
-                {{#if this.displayOverwriteWarning}}
-                    <button type="button" {{on "click" this.confirmOverwrite}} class="gh-btn gh-btn-red" data-test-button="overwrite">
-                        <span>Overwrite</span>
-                    </button>
-                {{/if}}
-                {{#if this.canActivateTheme}}
-                    <button type="button" {{on "click" this.activate}} class="gh-btn gh-btn-primary" data-test-button="activate">
-                        <span>Activate{{#if this.validationErrors}} with errors{{/if}}</span>
-                    </button>
-                {{/if}}
-                {{#if (or this.validationErrors this.fatalValidationErrors)}}
-                    <button type="button" {{on "click" this.reset}} class="gh-btn gh-btn-black ml2" data-test-button="retry">
-                        <span>Retry</span>
-                    </button>
-                {{/if}}
-            </div>
-        </div>
-    </div>
-</div>
diff --git a/ghost/admin/app/components/modals/design/upload-theme.js b/ghost/admin/app/components/modals/design/upload-theme.js
deleted file mode 100644
index 5a2ec2df325..00000000000
--- a/ghost/admin/app/components/modals/design/upload-theme.js
+++ /dev/null
@@ -1,174 +0,0 @@
-import Component from '@glimmer/component';
-import {
-    UnsupportedMediaTypeError,
-    isThemeValidationError
-} from 'ghost-admin/services/ajax';
-import {action} from '@ember/object';
-import {run} from '@ember/runloop';
-import {inject as service} from '@ember/service';
-import {task} from 'ember-concurrency';
-import {tracked} from '@glimmer/tracking';
-
-export default class UploadThemeModal extends Component {
-    @service eventBus;
-    @service ghostPaths;
-    @service store;
-    @service themeManagement;
-
-    static modalOptions = {
-        beforeClose: () => {
-            if (this.themeManagement.isUploading) {
-                return false;
-            }
-        }
-    };
-
-    @tracked displayOverwriteWarning = false;
-    @tracked file;
-    @tracked theme;
-    @tracked validationErrors;
-    @tracked validationWarnings;
-    @tracked fatalValidationErrors;
-
-    accept = ['application/zip', 'application/x-zip-compressed'];
-    extensions = ['zip'];
-
-    get themes() {
-        return this.store.peekAll('theme');
-    }
-
-    get currentThemeNames() {
-        return this.themes.map(theme => theme.name);
-    }
-
-    get themeName() {
-        let themePackage = this.theme.package;
-        let name = this.theme.name;
-
-        return themePackage ? `${themePackage.name} - ${themePackage.version}` : name;
-    }
-
-    get fileThemeName() {
-        return this.file?.name.replace(/\.zip$/, '');
-    }
-
-    get canActivateTheme() {
-        return this.theme && !this.theme.active;
-    }
-
-    get uploadUrl() {
-        return `${this.ghostPaths.apiRoot}/themes/upload/`;
-    }
-
-    get hasWarningsOrErrors() {
-        return this.validationWarnings?.length || this.validationErrors?.length;
-    }
-
-    get closeDisabled() {
-        return this.themeManagement.isUploading;
-    }
-
-    constructor() {
-        super(...arguments);
-        this.refreshThemesTask.perform();
-    }
-
-    @task
-    *refreshThemesTask() {
-        yield this.store.findAll('theme');
-    }
-
-    @action
-    validateTheme(file) {
-        const themeName = file.name.replace(/\.zip$/, '').replace(/[^\w@.]/gi, '-').toLowerCase();
-
-        this.file = file;
-
-        const [, extension] = (/(?:\.([^.]+))?$/).exec(file.name);
-        const extensions = this.extensions;
-
-        if (!extension || extensions.indexOf(extension.toLowerCase()) === -1) {
-            return new UnsupportedMediaTypeError();
-        }
-
-        if (file.name.match(/^casper\.zip$/i) || file.name.match(/^source\.zip$/i)) {
-            return {payload: {errors: [{message: 'Sorry, the default theme cannot be overwritten.<br>Please rename your zip file to continue.'}]}};
-        }
-
-        if (!this._allowOverwrite && this.currentThemeNames.includes(themeName)) {
-            this.displayOverwriteWarning = true;
-            return false;
-        }
-
-        return true;
-    }
-
-    @action
-    confirmOverwrite() {
-        this._allowOverwrite = true;
-        this.displayOverwriteWarning = false;
-
-        // we need to schedule afterRender so that the upload component is
-        // displayed again in order to subscribe/respond to the event bus
-        run.schedule('afterRender', this, function () {
-            this.eventBus.publish('themeUploader:upload', this.file);
-        });
-    }
-
-    @action
-    uploadSuccess(response) {
-        this.store.pushPayload(response);
-
-        const theme = this.store.peekRecord('theme', response.themes[0].name);
-
-        this.theme = theme;
-
-        if (theme.warnings?.length > 0) {
-            this.validationWarnings = theme.warnings;
-        }
-
-        // Ghost differentiates between errors and fatal errors
-        // You can't activate a theme with fatal errors, but with errors.
-        if (theme.gscanErrors?.length > 0) {
-            this.validationErrors = theme.gscanErrors;
-        }
-    }
-
-    @action
-    uploadFailed(errorResponse) {
-        if (isThemeValidationError(errorResponse)) {
-            const errors = errorResponse.payload.errors[0].details.errors;
-            const fatalErrors = [];
-            const normalErrors = [];
-
-            // to have a proper grouping of fatal errors and none fatal, we need to check
-            // our errors for the fatal property
-            errors.forEach?.((error) => {
-                if (error.fatal) {
-                    fatalErrors.push(error);
-                } else {
-                    normalErrors.push(error);
-                }
-            });
-
-            this.fatalValidationErrors = fatalErrors;
-            this.validationErrors = normalErrors;
-            this.validationWarnings = errorResponse.payload.errors[0].details.warnings || [];
-        }
-    }
-
-    @action
-    activate() {
-        this.themeManagement.activateTask.perform(this.theme);
-        this.args.data.onActivationSuccess?.();
-        this.args.close();
-    }
-
-    @action
-    reset() {
-        this.theme = null;
-        this.validationWarnings = [];
-        this.validationErrors = [];
-        this.fatalValidationErrors = [];
-    }
-}
diff --git a/ghost/admin/app/components/modals/design/view-theme.hbs b/ghost/admin/app/components/modals/design/view-theme.hbs
deleted file mode 100644
index 910b2ef1a3a..00000000000
--- a/ghost/admin/app/components/modals/design/view-theme.hbs
+++ /dev/null
@@ -1,24 +0,0 @@
-<section class="gh-canvas gh-theme-preview flex flex-column h-100">
-    <GhCanvasHeader class="gh-canvas-header">
-        <h2 class="gh-canvas-title" data-test-screen-title>
-            <LinkTo @route="settings.design.change-theme" data-test-link="back">Themes</LinkTo>
-            <span>{{svg-jar "arrow-right"}}</span>
-            {{@data.theme.name}}
-        </h2>
-
-        <section class="view-actions">
-            <div class="gh-contentfilter gh-btn-group">
-                <button type="button" class="gh-btn gh-design-preview-mode {{if this.isDesktopPreview "gh-btn-group-selected"}}" {{on "click" (fn this.setPreviewSize "desktop")}}><span>{{svg-jar "desktop"}}</span></button>
-                <button type="button" class="gh-btn gh-design-preview-mode {{if this.isMobilePreview "gh-btn-group-selected"}}" {{on "click" (fn this.setPreviewSize "mobile")}}><span>{{svg-jar "mobile-phone"}}</span></button>
-            </div>
-
-            <button type="button" class="gh-btn gh-btn-primary" {{on "click" this.installTheme}} data-test-button="install-theme"><span>Use {{@data.theme.name}}</span></button>
-        </section>
-    </GhCanvasHeader>
-
-    <section class="view-container">
-        <GhBrowserPreview @isMobilePreview={{this.isMobilePreview}}>
-            <iframe class={{if this.isMobilePreview "gh-post-preview-iframe" "site-frame"}} src={{@data.theme.previewUrl}} title="{{@data.theme.name}} theme preview" />
-        </GhBrowserPreview>
-    </section>
-</section>
\ No newline at end of file
diff --git a/ghost/admin/app/components/modals/design/view-theme.js b/ghost/admin/app/components/modals/design/view-theme.js
deleted file mode 100644
index 73eecc439fe..00000000000
--- a/ghost/admin/app/components/modals/design/view-theme.js
+++ /dev/null
@@ -1,52 +0,0 @@
-import Component from '@glimmer/component';
-import InstallThemeModal from './install-theme';
-import {action} from '@ember/object';
-import {inject as service} from '@ember/service';
-import {tracked} from '@glimmer/tracking';
-
-export default class ViewThemeModal extends Component {
-    @service modals;
-    @service router;
-
-    static modalOptions = {
-        className: 'fullscreen-modal-total-overlay',
-        omitBackdrop: true
-    };
-
-    @tracked previewSize = 'desktop';
-
-    get isDesktopPreview() {
-        return this.previewSize === 'desktop';
-    }
-
-    get isMobilePreview() {
-        return this.previewSize === 'mobile';
-    }
-
-    willDestroy() {
-        super.willDestroy(...arguments);
-
-        // leave install modal visiible if it's in the success state because
-        // we're switching over to the design customisation screen in the bg
-        // and don't want to auto-close when this modal closes
-        if (this.installModal && !this.showingSuccessModal) {
-            this.installModal.close();
-        }
-    }
-
-    @action
-    installTheme() {
-        this.installModal = this.modals.open(InstallThemeModal, {
-            theme: this.args.data.theme,
-            onSuccess: () => {
-                this.showingSuccessModal = true;
-                this.router.transitionTo('settings.design');
-            }
-        });
-    }
-
-    @action
-    setPreviewSize(size) {
-        this.previewSize = size;
-    }
-}
diff --git a/ghost/admin/app/components/modals/limits/custom-integration.hbs b/ghost/admin/app/components/modals/limits/custom-integration.hbs
deleted file mode 100644
index 649c5932eb0..00000000000
--- a/ghost/admin/app/components/modals/limits/custom-integration.hbs
+++ /dev/null
@@ -1,22 +0,0 @@
-<div class="modal-content" data-test-modal="limits/custom-integration">
-    <header class="modal-header">
-        <h1>Upgrade to enable custom integrations</h1>
-    </header>
-    <button class="close" title="Close" type="button" {{on "click" @close}}>{{svg-jar "close"}}<span class="hidden">Close</span></button>
-
-    <div class="modal-body">
-        <p>
-            {{html-safe @data.message}}
-        </p>
-    </div>
-
-    <div class="modal-footer">
-        <button class="gh-btn" data-test-button="cancel-upgrade" type="button" {{on "click" @close}}>
-            <span>Cancel</span>
-        </button>
-
-        <LinkTo @route="pro" class="gh-btn gh-btn-green" {{on "click" @close}} data-test-button="upgrade-plan">
-            <span>Upgrade my plan</span>
-        </LinkTo>
-    </div>
-</div>
\ No newline at end of file
diff --git a/ghost/admin/app/components/modals/limits/custom-theme.hbs b/ghost/admin/app/components/modals/limits/custom-theme.hbs
deleted file mode 100644
index 9f821c9b7ae..00000000000
--- a/ghost/admin/app/components/modals/limits/custom-theme.hbs
+++ /dev/null
@@ -1,27 +0,0 @@
-
-<div class="modal-content" data-test-modal="limits/custom-theme">
-    <header class="modal-header">
-        <h1>Upgrade to enable custom themes</h1>
-    </header>
-    <button class="close" title="Close" type="button" {{on "click" @close}}>{{svg-jar "close"}}<span class="hidden">Close</span></button>
-
-    <div class="modal-body">
-        <p>
-            {{#if @data.message}}
-                {{html-safe @data.message}}
-            {{else}}
-                Your current plan only supports official themes. You can install them from the <a href="https://ghost.org/marketplace/">Ghost theme marketplace</a>.
-            {{/if}}
-        </p>
-    </div>
-
-    <div class="modal-footer">
-        <button class="gh-btn" data-test-button="cancel-upgrade" type="button" {{on "click" @close}}>
-            <span>Cancel</span>
-        </button>
-
-        <LinkTo @route="pro" class="gh-btn gh-btn-green" {{on "click" @close}} data-test-button="upgrade-plan">
-            <span>Upgrade</span>
-        </LinkTo>
-    </div>
-</div>
\ No newline at end of file
diff --git a/ghost/admin/app/components/modals/limits/multiple-newsletters.hbs b/ghost/admin/app/components/modals/limits/multiple-newsletters.hbs
deleted file mode 100644
index 596b1693da1..00000000000
--- a/ghost/admin/app/components/modals/limits/multiple-newsletters.hbs
+++ /dev/null
@@ -1,27 +0,0 @@
-
-<div class="modal-content" data-test-modal="limits/multiple-newsletters">
-    <header class="modal-header">
-        <h1>Upgrade your plan</h1>
-    </header>
-    <button class="close" title="Close" type="button" {{on "click" @close}}>{{svg-jar "close"}}<span class="hidden">Close</span></button>
-
-    <div class="modal-body">
-        <p>
-            {{#if @data.message}}
-                {{html-safe @data.message}}
-            {{else}}
-                Your current plan doesn't support more newsletters.
-            {{/if}}
-        </p>
-    </div>
-
-    <div class="modal-footer">
-        <button class="gh-btn" data-test-button="cancel-upgrade" type="button" {{on "click" @close}}>
-            <span>Cancel</span>
-        </button>
-
-        <LinkTo @route="pro" class="gh-btn gh-btn-green" {{on "click" @close}} data-test-button="upgrade-plan">
-            <span>Upgrade</span>
-        </LinkTo>
-    </div>
-</div>
diff --git a/ghost/admin/app/components/modals/newsletters/components/color-picker.hbs b/ghost/admin/app/components/modals/newsletters/components/color-picker.hbs
deleted file mode 100644
index 17b439f368c..00000000000
--- a/ghost/admin/app/components/modals/newsletters/components/color-picker.hbs
+++ /dev/null
@@ -1,18 +0,0 @@
-<div class="gh-email-design-color-picker">
-    <div class="gh-btn-group">
-        {{#each this.presetColors as |color|}}
-            <button type="button" class="gh-btn gh-email-design-color {{color.class}} {{if (eq this.currentColorObject.value color.value) "gh-btn-group-selected"}}" {{on "click" (fn this.setCurrentColor color.value) }}>
-                <div style={{html-safe color.style}}></div>
-            </button>
-        {{/each}}
-        <label type="button" class="gh-btn gh-email-design-color custom {{if this.customColorSelected "gh-btn-group-selected"}}" {{on "click" this.onOpenColorPicker}}>
-            <div style={{html-safe this.customColorStyle}}></div>
-            <input
-                type="color"
-                value={{this.colorInputValue}}
-                {{on "input" this.updateColorInputValue}}
-                {{on "change" this.updateColorInputValue}}
-            />
-        </label>
-    </div>
-</div>
diff --git a/ghost/admin/app/components/modals/newsletters/components/color-picker.js b/ghost/admin/app/components/modals/newsletters/components/color-picker.js
deleted file mode 100644
index e99ffeea7f6..00000000000
--- a/ghost/admin/app/components/modals/newsletters/components/color-picker.js
+++ /dev/null
@@ -1,129 +0,0 @@
-import Component from '@glimmer/component';
-import {action} from '@ember/object';
-import {tracked} from '@glimmer/tracking';
-
-export default class ColorPicker extends Component {
-    @tracked
-        mouseOver = false;
-    @tracked
-        lastSelectedCustomColor = null;
-
-    /**
-     * Whether the custom color was changed during the current hover
-     */
-    @tracked
-        didSelectCustomColor = false;
-
-    timer;
-
-    get presetColors() {
-        return this.args.presetColors ?? [];
-    }
-
-    get currentColor() {
-        return this.args.color || null;
-    }
-
-    set currentColor(value) {
-        this.args.onColorChange(value);
-    }
-
-    @action
-    setCurrentColor(value) {
-        this.currentColor = value;
-    }
-
-    @action
-    onMouseEnter() {
-        this.mouseOver = true;
-
-        if (this.timer) {
-            clearTimeout(this.timer);
-            this.timer = null;
-        }
-
-        if (this.customColorSelected) {
-            this.didSelectCustomColor = true;
-            this.lastSelectedCustomColor = this.currentColor;
-        }
-    }
-
-    @action
-    onMouseLeave() {
-        this.mouseOver = false;
-
-        if (this.timer) {
-            clearTimeout(this.timer);
-        }
-
-        // Wait until the animation is complete
-        this.timer = setTimeout(() => {
-            this.didSelectCustomColor = false;
-            this.timer = null;
-        }, 350);
-    }
-
-    get customColorSelected() {
-        if (!this.presetColors.find(c => c.value === this.currentColor)) {
-            return true;
-        }
-        return false;
-    }
-
-    get customColorStyle() {
-        // Make sure the current color is present
-        if (this.customColorSelected) {
-            return 'background: ' + this.currentColor + ' !important;';
-        }
-        return '';
-    }
-
-    get currentColorObject() {
-        for (const preset of this.presetColors) {
-            if (preset.value === this.currentColor) {
-                return preset;
-            }
-        }
-        return {
-            value: this.currentColor,
-            name: this.currentColor,
-            class: 'custom-value',
-            style: 'background: ' + this.currentColor + ' !important;'
-        };
-    }
-
-    get colorInputValue() {
-        if (!this.currentColorObject.value || !this.currentColorObject.value.startsWith('#')) {
-            return '#999999';
-        }
-        return this.currentColorObject.value;
-    }
-
-    @action
-    onOpenColorPicker() {
-        this.didSelectCustomColor = true;
-        this.lastSelectedCustomColor = this.colorInputValue;
-        // This one is required because when choosing custom color, the initial color
-        // is never fired in the input or change event, which can be annoying
-        this.setCurrentColor(this.colorInputValue);
-    }
-
-    @action
-    updateColorInputValue(event) {
-        let newColor = event.target.value;
-
-        if (!newColor) {
-            // Invalid
-            return;
-        }
-
-        if (newColor[0] !== '#') {
-            newColor = `#${newColor}`;
-        }
-
-        if (newColor.match(/#[0-9A-Fa-f]{6}$/)) {
-            this.lastSelectedCustomColor = newColor.toUpperCase();
-            this.setCurrentColor(newColor.toUpperCase());
-        }
-    }
-}
diff --git a/ghost/admin/app/components/modals/newsletters/components/feedback-button.hbs b/ghost/admin/app/components/modals/newsletters/components/feedback-button.hbs
deleted file mode 100644
index 5f8f3182fff..00000000000
--- a/ghost/admin/app/components/modals/newsletters/components/feedback-button.hbs
+++ /dev/null
@@ -1,13 +0,0 @@
-<button class="gh-members-emailpreview-feedback-button" type="button">
-    {{#if (feature 'emailCustomization')}}
-        <span class="gh-members-emailpreview-feedback-button-body" style={{html-safe (concat "color: " @textColor)}}>
-            {{svg-jar @icon class="gh-members-emailpreview-feedback-button-icon"}}
-            <span>{{@text}}</span>
-        </span>
-    {{else}}
-        <span class="gh-members-emailpreview-feedback-button-body">
-            {{svg-jar @icon class="gh-members-emailpreview-feedback-button-icon"}}
-            <span>{{@text}}</span>
-        </span>
-    {{/if}}
-</button>
diff --git a/ghost/admin/app/components/modals/newsletters/components/latest-post.hbs b/ghost/admin/app/components/modals/newsletters/components/latest-post.hbs
deleted file mode 100644
index 1595497e9b3..00000000000
--- a/ghost/admin/app/components/modals/newsletters/components/latest-post.hbs
+++ /dev/null
@@ -1,14 +0,0 @@
-<div class="gh-members-emailpreview-latest-post">
-    {{#if (feature 'emailCustomization')}}
-        <div>
-            <h4 style={{html-safe (concat "color: " @textColor)}}>{{@postTitle}}</h4>
-            <p style={{html-safe (concat "color: " @secondaryTextColor " !important")}}>{{@postExcerpt}}</p>
-        </div>
-    {{else}}
-        <div>
-            <h4>{{@postTitle}}</h4>
-            <p>{{@postExcerpt}}</p>
-        </div>
-    {{/if}}
-    <div class="gh-members-emailpreview-latest-post-image" style={{html-safe (concat "background-image: url(" @imgPath ")")}}></div>
-</div>
\ No newline at end of file
diff --git a/ghost/admin/app/components/modals/newsletters/confirm-archive.hbs b/ghost/admin/app/components/modals/newsletters/confirm-archive.hbs
deleted file mode 100644
index 57431e1914a..00000000000
--- a/ghost/admin/app/components/modals/newsletters/confirm-archive.hbs
+++ /dev/null
@@ -1,36 +0,0 @@
-<div class="modal-content">
-    <header class="modal-header" data-test-modal="confirm-newsletter-archive">
-        <h1>Archive newsletter</h1>
-    </header>
-    <button type="button" class="close" title="Close" {{on "click" (fn @close false)}}>{{svg-jar "close"}}<span class="hidden">Close</span></button>
-
-    <div class="modal-body">
-        <p>
-            Your newsletter <strong>{{@data.newsletter.name}}</strong> will no longer be visible to members or available as an option when publishing new posts.
-        </p>
-        <p>
-            Existing posts previously sent as this newsletter will remain unchanged.
-        </p>
-    </div>
-
-    <div class="modal-footer" {{on-key "Enter" (perform @data.archiveNewsletterTask @data.newsletter)}}>
-        <button
-            type="button"
-            class="gh-btn"
-            {{on "click" (fn @close false)}}
-            data-test-button="cancel-newsletter-archive"
-        >
-            <span>Cancel</span>
-        </button>
-
-        <GhTaskButton
-            @buttonText="Archive"
-            @runningText="Archiving"
-            @showSuccess={{false}}
-            @task={{@data.archiveNewsletterTask}}
-            @taskArgs={{@data.newsletter}}
-            @class="gh-btn gh-btn-black gh-btn-icon"
-            data-test-button="confirm-newsletter-archive"
-        />
-    </div>
-</div>
diff --git a/ghost/admin/app/components/modals/newsletters/confirm-newsletter-email.hbs b/ghost/admin/app/components/modals/newsletters/confirm-newsletter-email.hbs
deleted file mode 100644
index d18bfd4ed56..00000000000
--- a/ghost/admin/app/components/modals/newsletters/confirm-newsletter-email.hbs
+++ /dev/null
@@ -1,27 +0,0 @@
-<div class="modal-content" data-test-modal="confirm-newsletter-email">
-    <header class="modal-header">
-        <h1>Confirm newsletter email address</h1>
-    </header>
-    <button type="button" class="close" title="Close" {{on "click" @close}}>{{svg-jar "close"}}<span class="hidden">Close</span></button>
-
-    <div class="modal-body">
-        <p>
-            We've sent a confirmation email to <strong>{{@data.newEmail}}</strong>.
-            Until the address has been verified newsletters will be sent from the
-            {{if @data.currentEmail "previous" "default"}} email address
-            ({{full-email-address (or @data.currentEmail "noreply")}}).
-        </p>
-    </div>
-
-    <div class="modal-footer">
-        <button
-            type="button"
-            class="gh-btn"
-            data-test-button="confirm-newsletter-email"
-            {{on "click" @close}}
-            {{on-key "Enter"}}
-        >
-            <span>Ok</span>
-        </button>
-    </div>
-</div>
diff --git a/ghost/admin/app/components/modals/newsletters/confirm-unarchive.hbs b/ghost/admin/app/components/modals/newsletters/confirm-unarchive.hbs
deleted file mode 100644
index 0180157bed0..00000000000
--- a/ghost/admin/app/components/modals/newsletters/confirm-unarchive.hbs
+++ /dev/null
@@ -1,33 +0,0 @@
-<div class="modal-content">
-    <header class="modal-header" data-test-modal="confirm-newsletter-reactivate">
-        <h1>Reactivate newsletter</h1>
-    </header>
-    <button type="button" class="close" title="Close" {{on "click" (fn @close false)}}>{{svg-jar "close"}}<span class="hidden">Close</span></button>
-
-    <div class="modal-body">
-        <p>
-            Reactivating <strong>{{@data.newsletter.name}}</strong> will immediately make it visible to members and re-enable it as an option when publishing new posts.
-        </p>
-    </div>
-
-    <div class="modal-footer" {{on-key "Enter" (perform @data.unarchiveNewsletterTask @data.newsletter)}}>
-        <button
-            type="button"
-            class="gh-btn"
-            data-test-button="cancel-newsletter-reactivate"
-            {{on "click" (fn @close false)}}
-        >
-            <span>Cancel</span>
-        </button>
-
-        <GhTaskButton
-            @buttonText="Reactivate"
-            @runningText="Reactivating"
-            @showSuccess={{false}}
-            @task={{@data.unarchiveNewsletterTask}}
-            @taskArgs={{@data.newsletter}}
-            @class="gh-btn gh-btn-black gh-btn-icon"
-            data-test-button="confirm-newsletter-reactivate"
-        />
-    </div>
-</div>
diff --git a/ghost/admin/app/components/modals/newsletters/edit.hbs b/ghost/admin/app/components/modals/newsletters/edit.hbs
deleted file mode 100644
index 10c904396c3..00000000000
--- a/ghost/admin/app/components/modals/newsletters/edit.hbs
+++ /dev/null
@@ -1,72 +0,0 @@
-<div class="modal-content" data-test-modal="edit-newsletter">
-    <div class="modal-body modal-fullsettings">
-        <div class="modal-fullsettings-body gh-newsletters-labs">
-            <div class="modal-fullsettings-sidebar-labs">
-                <h2 class="modal-fullsettings-heading-labs">
-                    {{if @data.newsletter.isNew "Create" "Edit"}} newsletter
-                </h2>
-                <div class="modal-fullsettings-body-labs">
-                    <div class="modal-fullsettings-top">
-                        <Modals::Newsletters::Edit::Settings @newsletter={{@data.newsletter}} @openSection={{this.openSection}} @toggleSection={{this.toggleSection}} />
-                        {{#if (feature 'emailCustomization')}}
-                            <Modals::Newsletters::Edit::DesignLabs @newsletter={{@data.newsletter}} @openSection={{this.openSection}} @toggleSection={{this.toggleSection}} />
-                        {{else}}
-                            <Modals::Newsletters::Edit::Design @newsletter={{@data.newsletter}} @openSection={{this.openSection}} @toggleSection={{this.toggleSection}} />
-                        {{/if}}
-                    </div>
-                    <div class="modal-fullsettings-bottom">
-                        <div class="modal-fullsettings-footer">
-                            <GhFormGroup>
-                                <div class="gh-members-emailsettings-promotelabel">
-                                    <span>{{svg-jar "heart"}}</span>
-                                    <div>
-                                        <h4 class="modal-fullsettings-title">Promote independent publishing</h4>
-                                        <p>Show you’re a part of the indie publishing movement with a small badge in the footer</p>
-                                    </div>
-                                </div>
-                                <div class="for-switch small">
-                                    <label
-                                        class="switch"
-                                        for="promote-ghost"
-                                    >
-                                        <input
-                                            type="checkbox"
-                                            checked={{@data.newsletter.showBadge}}
-                                            id="promote-ghost"
-                                            name="promote-ghost"
-                                            {{on "click" (fn this.toggleSetting "showBadge")}}
-                                        >
-                                        <span class="input-toggle-component"></span>
-                                    </label>
-                                </div>
-                            </GhFormGroup>
-                        </div>
-                    </div>
-                </div>
-            </div>
-
-            <div class="modal-fullsettings-main">
-                <div class="modal-fullsettings-main-topbar-labs">
-                    <button class="gh-btn mr3" type="button" {{on "click" @close}} data-test-button="cancel-newsletter">
-                        <span>Cancel</span>
-                    </button>
-
-                    <GhTaskButton
-                        @buttonText="Save and close"
-                        @successText="Saved"
-                        @task={{this.saveTask}}
-                        @idleClass="gh-btn-primary"
-                        @class="gh-btn gh-btn-icon"
-                        {{on-key "cmd+s" this.saveViaKeyboard priority=1}}
-                        data-test-button="save-newsletter"
-                    />
-                </div>
-                {{#if (feature 'emailCustomization')}}
-                    <Modals::Newsletters::Edit::PreviewLabs @newsletter={{@data.newsletter}} />
-                {{else}}
-                    <Modals::Newsletters::Edit::Preview @newsletter={{@data.newsletter}} />
-                {{/if}}
-            </div>
-        </div>
-    </div>
-</div>
diff --git a/ghost/admin/app/components/modals/newsletters/edit.js b/ghost/admin/app/components/modals/newsletters/edit.js
deleted file mode 100644
index 287f3ef4d32..00000000000
--- a/ghost/admin/app/components/modals/newsletters/edit.js
+++ /dev/null
@@ -1,88 +0,0 @@
-import Component from '@glimmer/component';
-import ConfirmNewsletterEmailModal from './confirm-newsletter-email';
-import {action} from '@ember/object';
-import {inject as service} from '@ember/service';
-import {task} from 'ember-concurrency';
-import {tracked} from '@glimmer/tracking';
-
-export default class EditNewsletterModal extends Component {
-    @service modals;
-
-    static modalOptions = {
-        className: 'fullscreen-modal-full-overlay fullscreen-modal-portal-settings',
-        ignoreBackdropClick: true
-    };
-
-    @tracked openSection = 'name';
-
-    willDestroy() {
-        super.willDestroy(...arguments);
-        this.args.data.newsletter.rollbackAttributes();
-    }
-
-    @action
-    saveViaKeyboard(event, responder) {
-        responder.stopPropagation();
-        event.preventDefault();
-
-        this.saveTask.perform();
-    }
-
-    @action
-    toggleSection(section) {
-        if (this.openSection === section) {
-            this.openSection = null;
-        } else {
-            this.openSection = section;
-        }
-    }
-
-    @action
-    toggleSetting(property, event) {
-        this.args.data.newsletter[property] = event.target.checked;
-    }
-
-    @task
-    *saveTask() {
-        const newsletter = this.args.data.newsletter;
-        try {
-            yield newsletter.validate({});
-
-            const newEmail = newsletter.senderEmail;
-
-            const result = yield newsletter.save({
-                adapterOptions: {
-                    include: 'count.active_members,count.posts'
-                }
-            });
-
-            if (result._meta?.sent_email_verification) {
-                yield this.modals.open(ConfirmNewsletterEmailModal, {
-                    newEmail,
-                    currentEmail: newsletter.senderEmail
-                });
-            }
-
-            this.args.data.afterSave?.(result);
-
-            return result;
-        } catch (error) {
-            if (error === undefined) {
-                // Validation error
-                return;
-            }
-
-            // Do we have an error that we can show inline?
-            if (error.payload && error.payload.errors) {
-                for (const payloadError of error.payload.errors) {
-                    if (payloadError.type === 'ValidationError' && payloadError.property && (payloadError.context || payloadError.message)) {
-                        // Context has a better error message for validation errors
-                        newsletter.errors.add(payloadError.property, payloadError.context || payloadError.message);
-                    }
-                }
-            }
-
-            throw error;
-        }
-    }
-}
diff --git a/ghost/admin/app/components/modals/newsletters/edit/design-labs.hbs b/ghost/admin/app/components/modals/newsletters/edit/design-labs.hbs
deleted file mode 100644
index 31adf51f5eb..00000000000
--- a/ghost/admin/app/components/modals/newsletters/edit/design-labs.hbs
+++ /dev/null
@@ -1,301 +0,0 @@
-<fieldset class="modal-fullsettings-form-labs email-design">
-    <h4 class="modal-fullsettings-section-title">Design</h4>
-
-    <div class="modal-fullsettings-section-labs">
-
-        {{#let (eq @openSection "design-header") as |isOpen|}}
-            <button class="modal-fullsettings-tab {{if isOpen "active"}}" type="button" {{on "click" (fn @toggleSection "design-header")}} data-test-nav-toggle="design.header">
-                {{svg-jar "email-header"}} Header
-                <span class="gh-nav-button-expand">{{svg-jar (if isOpen "arrow-up-stroke" "arrow-down-stroke")}}</span>
-            </button>
-            {{#liquid-if isOpen}}
-                <div class="modal-fullsettings-tab-expanded">
-                    <div class="gh-stack">
-                        <GhFormGroup class="gh-stack-item">
-                            <GhUploader
-                                @extensions={{this.imageExtensions}}
-                                @paramsHash={{hash purpose="image"}}
-                                @onComplete={{fn this.imageUploaded "headerImage"}}
-                                as |uploader|
-                            >
-                                <div class="modal-fullsettings-uploader">
-                                    <div class="gh-header-img-desc">
-                                        <label class="modal-fullsettings-title">Header image</label>
-                                        <p>Optional, recommended size 1200x600</p>
-                                    </div>
-                                    {{#if uploader.isUploading}}
-                                        <div class="gh-header-img-container">
-                                            <div class="gh-loading-spinner"></div>
-                                        </div>
-                                    {{else if @newsletter.headerImage}}
-                                        <div class="gh-header-img">
-                                            <img
-                                                class="gh-header-img-thumbnail"
-                                                src={{@newsletter.headerImage}}
-                                                alt=""
-                                                role="presentation"
-                                                data-test-img="header"
-                                            >
-                                            <button type="button" class="gh-btn gh-header-img-deleteicon" {{on "click" (fn this.changeSetting "headerImage" null)}}>
-                                                <span> {{svg-jar "trash" class="w5 h5"}} </span>
-                                            </button>
-                                        </div>
-                                    {{else}}
-                                        <button type="button" class="gh-btn gh-header-img-uploadicon" {{on "click" uploader.triggerFileDialog}} data-test-image-upload-btn="header-image">
-                                            <span>{{svg-jar "upload-fill" class="w5 h5"}}</span>
-                                        </button>
-                                        <div style="display:none">
-                                            <GhFileInput
-                                                @multiple={{false}}
-                                                @action={{uploader.setFiles}}
-                                                @accept={{uploader.imageMimeTypes}}
-                                                @onInsert={{uploader.registerFileInput}}
-                                                data-test-file-input="icon" />
-                                        </div>
-                                    {{/if}}
-                                </div>
-                            </GhUploader>
-                        </GhFormGroup>
-
-                        {{#if this.settings.icon}}
-                            <GhFormGroup class="gh-stack-item row">
-                                <label class="modal-fullsettings-title {{unless this.settings.icon "disabled"}}">Publication icon</label>
-                                <div class="for-switch x-small {{unless this.settings.icon "disabled"}}">
-                                    <label class="switch" for="show-header">
-                                        <input
-                                            type="checkbox"
-                                            checked={{and @newsletter.showHeaderIcon this.settings.icon}}
-                                            id="show-header"
-                                            name="show-header"
-                                            disabled={{not this.settings.icon}}
-                                            {{on "click" (fn this.toggleSetting "showHeaderIcon")}}
-                                        >
-                                        <span class="input-toggle-component"></span>
-                                    </label>
-                                </div>
-                            </GhFormGroup>
-                        {{/if}}
-
-                        <GhFormGroup class="gh-stack-item row">
-                            <label class="modal-fullsettings-title">Publication title</label>
-                            <div class="for-switch x-small">
-                                <label class="switch" for="show-title" data-test-toggle="showHeaderTitle">
-                                    <input
-                                        type="checkbox"
-                                        checked={{@newsletter.showHeaderTitle}}
-                                        id="show-title"
-                                        name="show-title"
-                                        {{on "click" (fn this.toggleSetting "showHeaderTitle")}}
-                                    >
-                                    <span class="input-toggle-component"></span>
-                                </label>
-                            </div>
-                        </GhFormGroup>
-                        <GhFormGroup class="gh-stack-item row">
-                            <label class="modal-fullsettings-title">Newsletter name</label>
-                            <div class="for-switch x-small">
-                                <label class="switch" for="show-header-name" data-test-toggle="showHeaderName">
-                                    <input
-                                        type="checkbox"
-                                        checked={{@newsletter.showHeaderName}}
-                                        id="show-header-name"
-                                        name="show-header-name"
-                                        {{on "click" (fn this.toggleSetting "showHeaderName")}}
-                                    >
-                                    <span class="input-toggle-component"></span>
-                                </label>
-                            </div>
-                        </GhFormGroup>
-                    </div>
-                </div>
-            {{/liquid-if}}
-        {{/let}}
-
-        {{#let (eq @openSection "design-body") as |isOpen|}}
-            <button class="modal-fullsettings-tab {{if isOpen "active"}}" type="button" {{on "click" (fn @toggleSection "design-body")}} data-test-nav-toggle="design.body">
-                {{svg-jar "email-body"}} Body
-                <span class="gh-nav-button-expand">{{svg-jar (if isOpen "arrow-up-stroke" "arrow-down-stroke")}}</span>
-            </button>
-            {{#liquid-if isOpen class="show-overflow"}}
-                <div class="modal-fullsettings-tab-expanded">
-                    <div class="gh-stack">
-                        <GhFormGroup class="gh-stack-item row">
-                            <label class="modal-fullsettings-title">Background color</label>
-                            <Modals::Newsletters::Components::ColorPicker
-                                @color={{@newsletter.backgroundColor}}
-                                @presetColors={{this.backgroundPresetColors}}
-                                @onColorChange={{fn this.changeSetting "backgroundColor"}}
-                            />
-                        </GhFormGroup>
-
-                        <GhFormGroup class="gh-stack-item row">
-                            <label class="modal-fullsettings-title">Border color</label>
-                            <Modals::Newsletters::Components::ColorPicker
-                                @color={{@newsletter.borderColor}}
-                                @presetColors={{this.borderPresetColors}}
-                                @onColorChange={{fn this.changeSetting "borderColor"}}
-                            />
-                        </GhFormGroup>
-
-                        <GhFormGroup class="gh-stack-item row">
-                            <label class="modal-fullsettings-title">Post title</label>
-                            <div class="for-switch x-small">
-                                <label class="switch" for="show-post-title">
-                                    <input
-                                        type="checkbox"
-                                        checked={{@newsletter.showPostTitleSection}}
-                                        id="show-post-title"
-                                        name="show-post-title"
-                                        {{on "click" (fn this.toggleSetting "showPostTitleSection")}}
-                                    >
-                                    <span class="input-toggle-component"></span>
-                                </label>
-                            </div>
-                        </GhFormGroup>
-
-                        {{#if @newsletter.showPostTitleSection}}
-                            <GhFormGroup class="gh-stack-item">
-                                <label class="modal-fullsettings-title">Post title style</label>
-                                <div class="gh-email-design-typography-wrapper header">
-                                    <div class="modal-fullsettings-radiogroup gh-email-design-typography" data-test-input="titleFontCategory">
-                                        <GhFontSelector
-                                            @selected={{@newsletter.titleFontCategory}}
-                                            @onChange={{fn this.changeSetting "titleFontCategory"}}
-                                        />
-                                    </div>
-                                    <div class="gh-btn-group icons" id="newsletter-title-alignment">
-                                        <button type="button" class="gh-btn gh-btn-icon {{if (eq @newsletter.titleAlignment "left") "gh-btn-group-selected"}}" {{on "click" (fn this.changeSetting "titleAlignment" "left")}}><span>{{svg-jar "align-left"}}</span></button>
-                                        <button type="button" class="gh-btn gh-btn-icon {{if (eq @newsletter.titleAlignment "center") "gh-btn-group-selected"}}" {{on "click" (fn this.changeSetting "titleAlignment" "center")}}><span>{{svg-jar "align-center"}}</span></button>
-                                    </div>
-                                </div>
-                            </GhFormGroup>
-                        {{/if}}
-                        <GhFormGroup class="gh-stack-item row">
-                            <label class="modal-fullsettings-title">Heading color</label>
-                            <Modals::Newsletters::Components::ColorPicker
-                                @color={{@newsletter.titleColor}}
-                                @presetColors={{this.titlePresetColors}}
-                                @onColorChange={{fn this.changeSetting "titleColor"}}
-                            />
-                        </GhFormGroup>
-
-                        <GhFormGroup class="gh-stack-item row">
-                            <label class="modal-fullsettings-title">Feature image</label>
-                            <div class="for-switch x-small">
-                                <label class="switch" for="show-feature-image">
-                                    <input
-                                        type="checkbox"
-                                        checked={{@newsletter.showFeatureImage}}
-                                        id="show-feature-image"
-                                        name="show-feature-image"
-                                        {{on "click" (fn this.toggleSetting "showFeatureImage")}}
-                                    >
-                                    <span class="input-toggle-component"></span>
-                                </label>
-                            </div>
-                        </GhFormGroup>
-                        <GhFormGroup class="gh-stack-item">
-                            <label class="modal-fullsettings-title">Body style</label>
-                            <div class="gh-email-design-typography-wrapper">
-                                <div class="modal-fullsettings-radiogroup gh-email-design-typography" data-test-input="bodyFontCategory">
-                                    <GhFontSelector
-                                        @selected={{@newsletter.bodyFontCategory}}
-                                        @onChange={{fn this.changeSetting "bodyFontCategory"}}
-                                    />
-                                </div>
-                            </div>
-                        </GhFormGroup>
-                    </div>
-                </div>
-            {{/liquid-if}}
-        {{/let}}
-
-        {{#let (eq @openSection "design-footer") as |isOpen|}}
-            <button class="modal-fullsettings-tab {{if isOpen "active"}}" type="button" {{on "click" (fn @toggleSection "design-footer")}} data-test-nav-toggle="design.footer">
-                {{svg-jar "email-footer"}} Footer
-                <span class="gh-nav-button-expand">{{svg-jar (if isOpen "arrow-up-stroke" "arrow-down-stroke")}}</span>
-            </button>
-            {{#liquid-if isOpen}}
-                <div class="modal-fullsettings-tab-expanded">
-                    <div class="gh-stack">
-
-                        {{#if (feature "audienceFeedback")}}
-                            <GhFormGroup class="gh-stack-item row">
-                                <label for="capture-feedback" class="modal-fullsettings-title" data-test-toggle="feedbackEnabled">Ask your readers for feedback</label>
-                                <div class="for-switch x-small">
-                                    <div class="container">
-                                        <input
-                                            type="checkbox"
-                                            id="capture-feedback"
-                                            checked={{@newsletter.feedbackEnabled}}
-                                            {{on "change" (fn this.onCheckboxChange "feedbackEnabled")}}
-                                        >
-                                        <button type="button" class="input-toggle-component" {{on "click" (fn this.toggleProperty "feedbackEnabled")}}></button>
-                                    </div>
-                                </div>
-                            </GhFormGroup>
-                        {{/if}}
-
-                        {{#unless (eq this.settings.commentsEnabled 'off') }}
-                            <GhFormGroup class="gh-stack-item row">
-                                <label for="comments-link" class="modal-fullsettings-title" data-test-toggle="showCommentCta">Add a link to your comments</label>
-                                <div class="for-switch x-small">
-                                    <div class="container">
-                                        <input
-                                            type="checkbox"
-                                            id="comments-link"
-                                            checked={{@newsletter.showCommentCta}}
-                                            {{on "change" (fn this.onCheckboxChange "showCommentCta")}}
-                                        >
-                                        <button type="button" class="input-toggle-component" {{on "click" (fn this.toggleProperty "showCommentCta")}}></button>
-                                    </div>
-                                </div>
-                            </GhFormGroup>
-                        {{/unless}}
-
-                        <GhFormGroup class="gh-stack-item row">
-                            <label for="latest-posts" class="modal-fullsettings-title" data-test-toggle="showLatestPosts">Share your latest posts</label>
-                            <div class="for-switch x-small">
-                                <div class="container">
-                                    <input
-                                        type="checkbox"
-                                        id="latest-posts"
-                                        checked={{@newsletter.showLatestPosts}}
-                                        {{on "change" (fn this.onCheckboxChange "showLatestPosts")}}
-                                    >
-                                    <button type="button" class="input-toggle-component" {{on "click" (fn this.toggleProperty "showLatestPosts")}}></button>
-                                </div>
-                            </div>
-                        </GhFormGroup>
-
-                        <GhFormGroup class="gh-stack-item row">
-                            <label for="capture-feedback" class="modal-fullsettings-title" data-test-toggle="showSubscriptionDetails">Show subscription details</label>
-                            <div class="for-switch x-small">
-                                <div class="container">
-                                    <input
-                                        type="checkbox"
-                                        id="capture-feedback"
-                                        checked={{@newsletter.showSubscriptionDetails}}
-                                        {{on "change" (fn this.onCheckboxChange "showSubscriptionDetails")}}
-                                    >
-                                    <button type="button" class="input-toggle-component" {{on "click" (fn this.toggleProperty "showSubscriptionDetails")}}></button>
-                                </div>
-                            </div>
-                        </GhFormGroup>
-
-                        <GhFormGroup class="gh-stack-item">
-                            <label class="modal-fullsettings-title">Email footer</label>
-                            <textarea
-                                id="footer"
-                                name="footer"
-                                class="miw-100 form-text gh-members-emailsettings-footer-input"
-                                {{on "change" (fn this.changeSetting "footerContent")}}
-                            >{{@newsletter.footerContent}}</textarea>
-                            <p>Any extra information or legal text</p>
-                        </GhFormGroup>
-                    </div>
-                </div>
-            {{/liquid-if}}
-        {{/let}}
-    </div>
-</fieldset>
diff --git a/ghost/admin/app/components/modals/newsletters/edit/design-labs.js b/ghost/admin/app/components/modals/newsletters/edit/design-labs.js
deleted file mode 100644
index 9c244a06196..00000000000
--- a/ghost/admin/app/components/modals/newsletters/edit/design-labs.js
+++ /dev/null
@@ -1,108 +0,0 @@
-import Component from '@glimmer/component';
-import {IMAGE_EXTENSIONS} from 'ghost-admin/components/gh-image-uploader';
-import {action} from '@ember/object';
-import {inject as service} from '@ember/service';
-import {textColorForBackgroundColor} from '@tryghost/color-utils';
-
-export default class EditNewsletterDesignForm extends Component {
-    @service settings;
-
-    imageExtensions = IMAGE_EXTENSIONS;
-
-    @action
-    onCheckboxChange(property, event) {
-        this.args.newsletter[property] = event.target.checked;
-    }
-
-    @action
-    toggleProperty(property) {
-        this.args.newsletter[property] = !this.args.newsletter[property];
-    }
-
-    @action
-    imageUploaded(property, images) {
-        if (images[0]) {
-            this.args.newsletter[property] = images[0].url;
-        }
-    }
-
-    @action
-    changeSetting(property, value) {
-        if (value instanceof Event) {
-            value = value.target.value;
-        }
-        this.args.newsletter[property] = value;
-    }
-
-    @action
-    toggleSetting(property, event) {
-        this.args.newsletter[property] = event.target.checked;
-    }
-
-    get backgroundColorIsDark() {
-        if (this.args.newsletter.backgroundColor === 'dark') {
-            return true;
-        }
-        if (this.args.newsletter.backgroundColor === 'light') {
-            return false;
-        }
-        return textColorForBackgroundColor(this.args.newsletter.backgroundColor).hex().toLowerCase() === '#ffffff';
-    }
-
-    get backgroundPresetColors() {
-        return [
-            {
-                value: '#f0f0f0',
-                name: 'Lightgrey',
-                class: '',
-                style: 'background: #f0f0f0 !important;'
-            },
-            {
-                value: 'light',
-                name: 'White',
-                class: 'white',
-                style: ''
-            }
-        ];
-    }
-
-    get borderPresetColors() {
-        return [
-            {
-                value: 'accent',
-                name: 'Accent',
-                class: 'accent',
-                style: ''
-            },
-            {
-                value: 'auto',
-                name: 'Auto',
-                class: this.backgroundColorIsDark ? 'white' : 'black',
-                style: ''
-            },
-            {
-                value: null,
-                name: 'Transparent',
-                class: 'transparent',
-                style: ''
-            }
-        ];
-    }
-
-    get titlePresetColors() {
-        return [
-            {
-                value: 'accent',
-                name: 'Accent',
-                class: 'accent',
-                style: ''
-            },
-            {
-                value: null,
-                name: 'Auto',
-                class: this.backgroundColorIsDark ? 'white' : 'black',
-                style: ''
-            }
-        ];
-    }
-}
diff --git a/ghost/admin/app/components/modals/newsletters/edit/design.hbs b/ghost/admin/app/components/modals/newsletters/edit/design.hbs
deleted file mode 100644
index 69598872a0c..00000000000
--- a/ghost/admin/app/components/modals/newsletters/edit/design.hbs
+++ /dev/null
@@ -1,273 +0,0 @@
-<fieldset class="modal-fullsettings-form-labs email-design">
-    <h4 class="modal-fullsettings-section-title">Design</h4>
-
-    <div class="modal-fullsettings-section-labs">
-
-        {{#let (eq @openSection "design-header") as |isOpen|}}
-            <button class="modal-fullsettings-tab {{if isOpen "active"}}" type="button" {{on "click" (fn @toggleSection "design-header")}} data-test-nav-toggle="design.header">
-                {{svg-jar "email-header"}} Header
-                <span class="gh-nav-button-expand">{{svg-jar (if isOpen "arrow-up-stroke" "arrow-down-stroke")}}</span>
-            </button>
-            {{#liquid-if isOpen}}
-                <div class="modal-fullsettings-tab-expanded">
-                    <div class="gh-stack">
-                        <GhFormGroup class="gh-stack-item">
-                            <GhUploader
-                                @extensions={{this.imageExtensions}}
-                                @paramsHash={{hash purpose="image"}}
-                                @onComplete={{fn this.imageUploaded "headerImage"}}
-                                as |uploader|
-                            >
-                                <div class="modal-fullsettings-uploader">
-                                    <div class="gh-header-img-desc">
-                                        <label class="modal-fullsettings-title">Header image</label>
-                                        <p>Optional, recommended size 1200x600</p>
-                                    </div>
-                                    {{#if uploader.isUploading}}
-                                        <div class="gh-header-img-container">
-                                            <div class="gh-loading-spinner"></div>
-                                        </div>
-                                    {{else if @newsletter.headerImage}}
-                                        <div class="gh-header-img">
-                                            <img
-                                                class="gh-header-img-thumbnail"
-                                                src={{@newsletter.headerImage}}
-                                                alt=""
-                                                role="presentation"
-                                                data-test-img="header"
-                                            >
-                                            <button type="button" class="gh-btn gh-header-img-deleteicon" {{on "click" (fn this.changeSetting "headerImage" null)}}>
-                                                <span> {{svg-jar "trash" class="w5 h5"}} </span>
-                                            </button>
-                                        </div>
-                                    {{else}}
-                                        <button type="button" class="gh-btn gh-header-img-uploadicon" {{on "click" uploader.triggerFileDialog}} data-test-image-upload-btn="header-image">
-                                            <span>{{svg-jar "upload-fill" class="w5 h5"}}</span>
-                                        </button>
-                                        <div style="display:none">
-                                            <GhFileInput
-                                                @multiple={{false}}
-                                                @action={{uploader.setFiles}}
-                                                @accept={{uploader.imageMimeTypes}}
-                                                @onInsert={{uploader.registerFileInput}}
-                                                data-test-file-input="icon" />
-                                        </div>
-                                    {{/if}}
-                                </div>
-                            </GhUploader>
-                        </GhFormGroup>
-
-                        {{#if this.settings.icon}}
-                            <GhFormGroup class="gh-stack-item row">
-                                <label class="modal-fullsettings-title {{unless this.settings.icon "disabled"}}">Publication icon</label>
-                                <div class="for-switch small {{unless this.settings.icon "disabled"}}">
-                                    <label class="switch" for="show-header">
-                                        <input
-                                            type="checkbox"
-                                            checked={{and @newsletter.showHeaderIcon this.settings.icon}}
-                                            id="show-header"
-                                            name="show-header"
-                                            disabled={{not this.settings.icon}}
-                                            {{on "click" (fn this.toggleSetting "showHeaderIcon")}}
-                                        >
-                                        <span class="input-toggle-component"></span>
-                                    </label>
-                                </div>
-                            </GhFormGroup>
-                        {{/if}}
-
-                        <GhFormGroup class="gh-stack-item row">
-                            <label class="modal-fullsettings-title">Publication title</label>
-                            <div class="for-switch small">
-                                <label class="switch" for="show-title" data-test-toggle="showHeaderTitle">
-                                    <input
-                                        type="checkbox"
-                                        checked={{@newsletter.showHeaderTitle}}
-                                        id="show-title"
-                                        name="show-title"
-                                        {{on "click" (fn this.toggleSetting "showHeaderTitle")}}
-                                    >
-                                    <span class="input-toggle-component"></span>
-                                </label>
-                            </div>
-                        </GhFormGroup>
-                        <GhFormGroup class="gh-stack-item row">
-                            <label class="modal-fullsettings-title">Newsletter name</label>
-                            <div class="for-switch small">
-                                <label class="switch" for="show-header-name" data-test-toggle="showHeaderName">
-                                    <input
-                                        type="checkbox"
-                                        checked={{@newsletter.showHeaderName}}
-                                        id="show-header-name"
-                                        name="show-header-name"
-                                        {{on "click" (fn this.toggleSetting "showHeaderName")}}
-                                    >
-                                    <span class="input-toggle-component"></span>
-                                </label>
-                            </div>
-                        </GhFormGroup>
-                    </div>
-                </div>
-            {{/liquid-if}}
-        {{/let}}
-
-        {{#let (eq @openSection "design-body") as |isOpen|}}
-            <button class="modal-fullsettings-tab {{if isOpen "active"}}" type="button" {{on "click" (fn @toggleSection "design-body")}} data-test-nav-toggle="design.body">
-                {{svg-jar "email-body"}} Body
-                <span class="gh-nav-button-expand">{{svg-jar (if isOpen "arrow-up-stroke" "arrow-down-stroke")}}</span>
-            </button>
-            {{#liquid-if isOpen class="show-overflow"}}
-                <div class="modal-fullsettings-tab-expanded">
-                    <div class="gh-stack">
-                        <GhFormGroup class="gh-stack-item row">
-                            <label class="modal-fullsettings-title">Post title</label>
-                            <div class="for-switch small">
-                                <label class="switch" for="show-post-title">
-                                    <input
-                                        type="checkbox"
-                                        checked={{@newsletter.showPostTitleSection}}
-                                        id="show-post-title"
-                                        name="show-post-title"
-                                        {{on "click" (fn this.toggleSetting "showPostTitleSection")}}
-                                    >
-                                    <span class="input-toggle-component"></span>
-                                </label>
-                            </div>
-                        </GhFormGroup>
-
-                        {{#if @newsletter.showPostTitleSection}}
-                            <GhFormGroup class="gh-stack-item">
-                                <div class="gh-email-design-typography-wrapper header">
-                                    <div class="modal-fullsettings-radiogroup gh-email-design-typography" data-test-input="titleFontCategory">
-                                        <GhFontSelector
-                                            @selected={{@newsletter.titleFontCategory}}
-                                            @onChange={{fn this.changeSetting "titleFontCategory"}}
-                                        />
-                                    </div>
-                                    <div class="gh-btn-group icons" id="newsletter-title-alignment">
-                                        <button type="button" class="gh-btn gh-btn-icon {{if (eq @newsletter.titleAlignment "left") "gh-btn-group-selected"}}" {{on "click" (fn this.changeSetting "titleAlignment" "left")}}><span>{{svg-jar "align-left"}}</span></button>
-                                        <button type="button" class="gh-btn gh-btn-icon {{if (eq @newsletter.titleAlignment "center") "gh-btn-group-selected"}}" {{on "click" (fn this.changeSetting "titleAlignment" "center")}}><span>{{svg-jar "align-center"}}</span></button>
-                                    </div>
-                                </div>
-                            </GhFormGroup>
-                        {{/if}}
-                        <GhFormGroup class="gh-stack-item row">
-                            <label class="modal-fullsettings-title">Feature image</label>
-                            <div class="for-switch small">
-                                <label class="switch" for="show-feature-image">
-                                    <input
-                                        type="checkbox"
-                                        checked={{@newsletter.showFeatureImage}}
-                                        id="show-feature-image"
-                                        name="show-feature-image"
-                                        {{on "click" (fn this.toggleSetting "showFeatureImage")}}
-                                    >
-                                    <span class="input-toggle-component"></span>
-                                </label>
-                            </div>
-                        </GhFormGroup>
-                        <GhFormGroup class="gh-stack-item">
-                            <label class="modal-fullsettings-title">Body style</label>
-                            <div class="gh-email-design-typography-wrapper">
-                                <div class="modal-fullsettings-radiogroup gh-email-design-typography" data-test-input="bodyFontCategory">
-                                    <GhFontSelector
-                                        @selected={{@newsletter.bodyFontCategory}}
-                                        @onChange={{fn this.changeSetting "bodyFontCategory"}}
-                                    />
-                                </div>
-                            </div>
-                        </GhFormGroup>
-                    </div>
-                </div>
-            {{/liquid-if}}
-        {{/let}}
-
-        {{#let (eq @openSection "design-footer") as |isOpen|}}
-            <button class="modal-fullsettings-tab {{if isOpen "active"}}" type="button" {{on "click" (fn @toggleSection "design-footer")}} data-test-nav-toggle="design.footer">
-                {{svg-jar "email-footer"}} Footer
-                <span class="gh-nav-button-expand">{{svg-jar (if isOpen "arrow-up-stroke" "arrow-down-stroke")}}</span>
-            </button>
-            {{#liquid-if isOpen}}
-                <div class="modal-fullsettings-tab-expanded">
-                    <div class="gh-stack">
-
-                        {{#if (feature "audienceFeedback")}}
-                            <GhFormGroup class="gh-stack-item row">
-                                <label for="capture-feedback" class="modal-fullsettings-title" data-test-toggle="feedbackEnabled">Ask your readers for feedback</label>
-                                <div class="for-switch small">
-                                    <div class="container">
-                                        <input
-                                            type="checkbox"
-                                            id="capture-feedback"
-                                            checked={{@newsletter.feedbackEnabled}}
-                                            {{on "change" (fn this.onCheckboxChange "feedbackEnabled")}}
-                                        >
-                                        <button type="button" class="input-toggle-component" {{on "click" (fn this.toggleProperty "feedbackEnabled")}}></button>
-                                    </div>
-                                </div>
-                            </GhFormGroup>
-                        {{/if}}
-
-                        {{#unless (eq this.settings.commentsEnabled 'off') }}
-                            <GhFormGroup class="gh-stack-item row">
-                                <label for="comments-link" class="modal-fullsettings-title" data-test-toggle="showCommentCta">Add a link to your comments</label>
-                                <div class="for-switch small">
-                                    <div class="container">
-                                        <input
-                                            type="checkbox"
-                                            id="comments-link"
-                                            checked={{@newsletter.showCommentCta}}
-                                            {{on "change" (fn this.onCheckboxChange "showCommentCta")}}
-                                        >
-                                        <button type="button" class="input-toggle-component" {{on "click" (fn this.toggleProperty "showCommentCta")}}></button>
-                                    </div>
-                                </div>
-                            </GhFormGroup>
-                        {{/unless}}
-
-                        <GhFormGroup class="gh-stack-item row">
-                            <label for="latest-posts" class="modal-fullsettings-title" data-test-toggle="showLatestPosts">Share your latest posts</label>
-                            <div class="for-switch small">
-                                <div class="container">
-                                    <input
-                                        type="checkbox"
-                                        id="latest-posts"
-                                        checked={{@newsletter.showLatestPosts}}
-                                        {{on "change" (fn this.onCheckboxChange "showLatestPosts")}}
-                                    >
-                                    <button type="button" class="input-toggle-component" {{on "click" (fn this.toggleProperty "showLatestPosts")}}></button>
-                                </div>
-                            </div>
-                        </GhFormGroup>
-
-                        <GhFormGroup class="gh-stack-item row">
-                            <label for="capture-feedback" class="modal-fullsettings-title" data-test-toggle="showSubscriptionDetails">Show subscription details</label>
-                            <div class="for-switch small">
-                                <div class="container">
-                                    <input
-                                        type="checkbox"
-                                        id="capture-feedback"
-                                        checked={{@newsletter.showSubscriptionDetails}}
-                                        {{on "change" (fn this.onCheckboxChange "showSubscriptionDetails")}}
-                                    >
-                                    <button type="button" class="input-toggle-component" {{on "click" (fn this.toggleProperty "showSubscriptionDetails")}}></button>
-                                </div>
-                            </div>
-                        </GhFormGroup>
-
-                        <GhFormGroup class="gh-stack-item">
-                            <label class="modal-fullsettings-title" for="footer">Email footer</label>
-                            <textarea
-                                id="footer"
-                                name="footer"
-                                class="miw-100 form-text gh-members-emailsettings-footer-input"
-                                {{on "change" (fn this.changeSetting "footerContent")}}
-                            >{{@newsletter.footerContent}}</textarea>
-                            <p>Any extra information or legal text</p>
-                        </GhFormGroup>
-                    </div>
-                </div>
-            {{/liquid-if}}
-        {{/let}}
-    </div>
-</fieldset>
diff --git a/ghost/admin/app/components/modals/newsletters/edit/design.js b/ghost/admin/app/components/modals/newsletters/edit/design.js
deleted file mode 100644
index 19228e75b13..00000000000
--- a/ghost/admin/app/components/modals/newsletters/edit/design.js
+++ /dev/null
@@ -1,37 +0,0 @@
-import Component from '@glimmer/component';
-import {IMAGE_EXTENSIONS} from 'ghost-admin/components/gh-image-uploader';
-import {action} from '@ember/object';
-import {inject as service} from '@ember/service';
-
-export default class EditNewsletterDesignForm extends Component {
-    @service settings;
-
-    imageExtensions = IMAGE_EXTENSIONS;
-
-    @action
-    onCheckboxChange(property, event) {
-        this.args.newsletter[property] = event.target.checked;
-    }
-
-    @action
-    toggleProperty(property) {
-        this.args.newsletter[property] = !this.args.newsletter[property];
-    }
-
-    @action
-    imageUploaded(property, images) {
-        if (images[0]) {
-            this.args.newsletter[property] = images[0].url;
-        }
-    }
-
-    @action
-    changeSetting(property, value) {
-        this.args.newsletter[property] = value;
-    }
-
-    @action
-    toggleSetting(property, event) {
-        this.args.newsletter[property] = event.target.checked;
-    }
-}
diff --git a/ghost/admin/app/components/modals/newsletters/edit/preview-labs.hbs b/ghost/admin/app/components/modals/newsletters/edit/preview-labs.hbs
deleted file mode 100644
index 5346b2cbea0..00000000000
--- a/ghost/admin/app/components/modals/newsletters/edit/preview-labs.hbs
+++ /dev/null
@@ -1,137 +0,0 @@
-<div class="gh-members-emailpreview gh-members-emailpreview-labs">
-    <div class="gh-members-emailpreview-container">
-        <div class="gh-members-emailpreview-faux">
-            <p>
-                <span class="strong">{{or @newsletter.senderName this.settings.title}}</span> &lt;{{full-email-address (or @newsletter.senderEmail "noreply")}}&gt;
-            </p>
-            <p><span class="dark">To:</span> Jamie Larson &lt;jamie@example.com&gt;</p>
-        </div>
-
-        <div class="gh-members-emailpreview-contents" style={{html-safe (concat "background: " this.backgroundColor)}}>
-            <div class="gh-members-emailpreview-border" style={{html-safe (concat "border-color: " this.borderColor)}}>
-                {{#if @newsletter.headerImage}}
-                    <div class="gh-members-emailpreview-header-image">
-                        <img src={{@newsletter.headerImage}} alt="" role="presentation">
-                    </div>
-                {{/if}}
-                {{#if this.showHeader}}
-                    <div class={{if (or (not @newsletter.showPostTitleSection) this.showHeaderTitle) "gh-members-emailpreview-header bordered" "gh-members-emailpreview-header"}} style={{html-safe (concat "border-color: " this.secondaryBorderColor)}}>
-                        {{#if (and this.settings.icon @newsletter.showHeaderIcon)}}
-                            <img src={{this.settings.icon}} alt="" role="presentation" />
-                        {{/if}}
-                        {{#if this.headerTitle}}
-                            <h4 style={{html-safe (concat "color: " this.textColor)}}>{{this.headerTitle}}</h4>
-                        {{/if}}
-                        {{#if this.headerSubtitle}}
-                            <h5 style={{html-safe (concat "color: " this.secondaryTextColor)}}>{{this.headerSubtitle}}</h5>
-                        {{/if}}
-                    </div>
-                {{/if}}
-                {{#if @newsletter.showPostTitleSection}}
-                    <div class="gh-members-emailpreview-title {{if (eq @newsletter.titleAlignment "left") "gh-members-emailpreview-title-left"}}">
-                        <h2 class="{{if (eq @newsletter.titleFontCategory "serif") "serif"}}" style={{html-safe (concat "color: " this.titleColor)}}>Your email newsletter</h2>
-                        <div class="gh-members-emailpreview-meta {{if (eq @newsletter.titleAlignment "center") "center-aligned"}}">
-                            <p style={{html-safe (concat "color: " this.secondaryTextColor)}}>By {{or this.session.user.name this.session.user.email}}
-                                <span style={{html-safe (concat "color: " this.secondaryTextColor)}}>{{moment-format (moment-site-tz) "D MMM YYYY"}}</span>
-                                {{#if this.showCommentCta}}
-                                    <span style={{html-safe (concat "color: " this.secondaryTextColor)}}><a href="javascript:" class="gh-members-emailpreview-comment-link" 
-                                    style={{html-safe (if this.backgroundColorIsDark "filter: brightness(2)")}}> {{svg-jar "comment"}}</a></span>
-                                {{/if}}
-                            </p>
-                            <p>
-                                <a href="javascript:" class="gh-members-emailpreview-view-online" style={{html-safe (concat "color: " this.secondaryTextColor)}}>View in browser</a>
-                            </p>
-                        </div>
-                    </div>
-                {{/if}}
-                {{#if @newsletter.showFeatureImage}}
-                    <div class="gh-members-emailpreview-featureimage" style={{this.featureImageStyle}}></div>
-                    <div class="gh-members-emailpreview-featureimage-caption" style={{html-safe (concat "color: " this.secondaryTextColor)}}>Feature image caption</div>
-                {{/if}}
-                <div class="gh-members-emailpreview-content {{if (eq @newsletter.bodyFontCategory "sans_serif") "sans-serif"}}" style={{html-safe (concat "border-color: " this.secondaryBorderColor)}}>
-                    <p style={{html-safe (concat "color: " this.textColor)}}>This is what your content will look like when you send one of your posts as an email newsletter to your subscribers.</p>
-                    <p style={{html-safe (concat "color: " this.textColor)}}>Over there on the left you’ll see some settings that allow you to customize the look and feel of this template to make it perfectly suited to your brand. Email templates are exceptionally finnicky to make, but we’ve spent a long time optimising this one to make it work beautifully across devices, email clients and content types.</p>
-                    <p style={{html-safe (concat "color: " this.textColor)}}>So, you can trust that every email you send with Ghost will look great and work well. Just like the rest of your site.</p>
-                </div>
-
-                {{#if (or (and @newsletter.feedbackEnabled (feature "audienceFeedback")) this.showCommentCta)}}
-                    <div class="gh-members-emailpreview-feedback" style={{html-safe (concat "border-color: " this.secondaryBorderColor)}}>
-                        <div class="gh-members-emailpreview-feedback-buttons-group">
-                            {{#if (and @newsletter.feedbackEnabled (feature "audienceFeedback"))}}
-                                <Modals::Newsletters::Components::FeedbackButton
-                                    @text="More like this"
-                                    @icon="thumbs-up"
-                                    @textColor={{html-safe this.textColor}} />
-
-                                <Modals::Newsletters::Components::FeedbackButton
-                                    @text="Less like this"
-                                    @icon="thumbs-down"
-                                    @textColor={{html-safe this.textColor}} />
-                            {{/if}}
-
-                            {{#if this.showCommentCta}}
-                                <Modals::Newsletters::Components::FeedbackButton
-                                    @text="Comment"
-                                    @icon="comment"
-                                    @textColor={{html-safe this.textColor}} />
-                            {{/if}}
-                        </div>
-                    </div>
-                {{/if}}
-
-                {{#if @newsletter.showLatestPosts}}
-                    <div class="gh-members-emailpreview-latest-posts" style={{html-safe (concat "border-color: " this.secondaryBorderColor)}}>
-                        <h3 class="pb2" style={{html-safe (concat "color: " this.titleColor)}}>Keep reading</h3>
-                        <Modals::Newsletters::Components::LatestPost
-                            @imgPath="assets/img/latest-posts-1.png"
-                            @postTitle="The three latest posts published on your site"
-                            @postExcerpt="Posts sent as an email only will never be shown here."
-                            @textColor={{html-safe this.textColor}}
-                            @secondaryTextColor={{html-safe this.secondaryTextColor}} />
-                        <Modals::Newsletters::Components::LatestPost
-                            @imgPath="assets/img/latest-posts-2.png"
-                            @postTitle="Displayed at the bottom of each newsletter"
-                            @postExcerpt="Giving your readers one more place to discover your stories."
-                            @textColor={{html-safe this.textColor}}
-                            @secondaryTextColor={{html-safe this.secondaryTextColor}} />
-                        <Modals::Newsletters::Components::LatestPost
-                            @imgPath="assets/img/latest-posts-3.png"
-                            @postTitle="To keep your work front and center"
-                            @postExcerpt="Making sure that your audience stays engaged."
-                            @textColor={{html-safe this.textColor}}
-                            @secondaryTextColor={{html-safe this.secondaryTextColor}} />
-                    </div>
-                {{/if}}
-
-                {{#if @newsletter.showSubscriptionDetails}}
-                    <div class="gh-members-emailpreview-subscription-details" style={{html-safe (concat "border-color: " this.secondaryBorderColor)}}>
-                        <h4 class="pb2" style={{html-safe (concat "color: " this.titleColor)}}>Subscription details</h4>
-                        <p class="pb4" style={{html-safe (concat "color: " this.textColor)}}>You are receiving this because you are a <strong>paid subscriber</strong> to The Local Host. Your subscription will renew on {{this.renewDateString}}.</p>
-                        <div class="flex">
-                            <div class="flex-shrink-0">
-                                <p style={{html-safe (concat "color: " this.textColor)}}>Name: Jamie Larson</p>
-                                <p style={{html-safe (concat "color: " this.textColor)}}>Email: jamie@example.com</p>
-                                <p style={{html-safe (concat "color: " this.textColor)}}>Member since: {{this.todayString}}</p>
-                            </div>
-                            <a href="#" class="gh-members-emailpreview-subscription-link" style={{html-safe (if this.backgroundColorIsDark "color: #FFF; text-decoration: underline;")}}>Manage subscription &rarr;</a>
-                        </div>
-                    </div>
-                {{/if}}
-
-                <div class="gh-members-emailpreview-footer">
-                    <div class="gh-members-emailpreview-footercontent" style={{html-safe (concat "color: " this.secondaryTextColor)}}>
-                        {{html-safe @newsletter.footerContent}}
-                    </div>
-                    <div class="gh-members-emailpreview-footersite">
-                        <span style={{html-safe (concat "color: " this.secondaryTextColor)}}>{{this.settings.title}} &copy; {{moment-format (moment-site-tz) "YYYY"}} – </span> <a href="javascript:" style={{html-safe (concat "color: " this.secondaryTextColor)}}>Unsubscribe</a>
-                    </div>
-                </div>
-                <div class="gh-members-emailpreview-badge {{unless @newsletter.showBadge "hide"}}">
-                    <a href="javascript:"><svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-                    <path fill-rule="evenodd" clip-rule="evenodd" d="M24 12C24 18.6274 18.6274 24 12 24C5.37258 24 0 18.6274 0 12C0 5.37258 5.37258 0 12 0C18.6274 0 24 5.37258 24 12ZM11.8326 2.33879C6.37785 2.95189 3.95901 5.20797 3.41126 9.74699C3.34896 10.2632 3.22642 10.7805 3.10443 11.2954C2.93277 12.02 2.76221 12.74 2.76221 13.4458C2.76221 17.9885 6.5856 21.556 11.1283 21.556C12.8959 21.556 14.4433 20.8144 15.8756 20.048C19.0536 18.3478 22.0328 16.2597 22.0328 12.5411C22.0328 9.91512 20.1051 7.56932 18.466 5.5747C18.3834 5.47416 18.3015 5.37451 18.2206 5.27577C17.3866 4.25742 14.4333 2.04643 11.8326 2.33879Z" fill="black"/>
-                    </svg> <span>Powered by Ghost</span></a>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
diff --git a/ghost/admin/app/components/modals/newsletters/edit/preview-labs.js b/ghost/admin/app/components/modals/newsletters/edit/preview-labs.js
deleted file mode 100644
index df1bdbc66f7..00000000000
--- a/ghost/admin/app/components/modals/newsletters/edit/preview-labs.js
+++ /dev/null
@@ -1,138 +0,0 @@
-import Component from '@glimmer/component';
-import config from 'ghost-admin/config/environment';
-import moment from 'moment-timezone';
-import {htmlSafe} from '@ember/template';
-import {inject as service} from '@ember/service';
-import {textColorForBackgroundColor} from '@tryghost/color-utils';
-
-export default class EditNewsletterPreview extends Component {
-    @service ghostPaths;
-    @service session;
-    @service settings;
-    @service membersUtils;
-
-    get accentColor() {
-        return this.settings.accentColor;
-    }
-
-    get backgroundColor() {
-        const value = this.args.newsletter.backgroundColor;
-
-        const validHex = /#([0-9a-f]{3}){1,2}$/i;
-
-        if (validHex.test(value)) {
-            return value;
-        }
-
-        if (value === 'dark') {
-            return '#15212a';
-        }
-
-        return '#ffffff';
-    }
-
-    get backgroundColorIsDark() {
-        return textColorForBackgroundColor(this.backgroundColor).hex().toLowerCase() === '#ffffff';
-    }
-
-    get borderColor() {
-        const value = this.args.newsletter.borderColor;
-
-        const validHex = /#([0-9a-f]{3}){1,2}$/i;
-
-        if (validHex.test(value)) {
-            return value;
-        }
-
-        if (value === 'auto') {
-            const backgroundColor = this.backgroundColor;
-            return textColorForBackgroundColor(backgroundColor).hex();
-        }
-
-        if (value === 'accent') {
-            return this.accentColor;
-        }
-
-        return null;
-    }
-
-    get secondaryBorderColor() {
-        return textColorForBackgroundColor(this.backgroundColor).alpha(0.12).toString();
-    }
-
-    get titleColor() {
-        const value = this.args.newsletter.titleColor;
-
-        const validHex = /#([0-9a-f]{3}){1,2}$/i;
-
-        if (validHex.test(value)) {
-            return value;
-        }
-
-        if (value === 'accent') {
-            return this.accentColor;
-        }
-
-        const backgroundColor = this.backgroundColor;
-        return textColorForBackgroundColor(backgroundColor).hex();
-    }
-    get textColor() {
-        return textColorForBackgroundColor(this.backgroundColor).hex();
-    }
-    get secondaryTextColor() {
-        return textColorForBackgroundColor(this.backgroundColor).alpha(0.5).toString();
-    }
-    get linkColor() {
-        return this.backgroundIsDark ? '#ffffff' : this.accentColor;
-    }
-
-    get showHeader() {
-        return (this.args.newsletter.showHeaderIcon && this.settings.icon)
-            || this.headerTitle;
-    }
-
-    get showHeaderTitle() {
-        return this.headerTitle || this.headerSubtitle;
-    }
-
-    get showCommentCta() {
-        return this.args.newsletter.showCommentCta && this.settings.commentsEnabled !== 'off';
-    }
-
-    get headerTitle() {
-        if (this.args.newsletter.showHeaderTitle) {
-            return this.settings.title;
-        } else if (this.args.newsletter.showHeaderName) {
-            return this.args.newsletter.name;
-        }
-
-        return null;
-    }
-
-    get headerSubtitle() {
-        if (this.args.newsletter.showHeaderTitle && this.args.newsletter.showHeaderName) {
-            return this.args.newsletter.name;
-        }
-
-        return null;
-    }
-
-    get featureImageUrl() {
-        // keep path separate so asset rewriting correctly picks it up
-        const imagePath = '/img/user-cover.png';
-        const fullPath = (config.cdnUrl ? '' : this.ghostPaths.assetRoot.replace(/\/$/, '')) + imagePath;
-        return fullPath;
-    }
-
-    get featureImageStyle() {
-        return htmlSafe(`background-image: url(${this.featureImageUrl})`);
-    }
-
-    get renewDateString() {
-        return moment().add(1, 'year').format('DD MMM YYYY');
-    }
-
-    get todayString() {
-        return moment().format('DD MMM YYYY');
-    }
-}
diff --git a/ghost/admin/app/components/modals/newsletters/edit/preview.hbs b/ghost/admin/app/components/modals/newsletters/edit/preview.hbs
deleted file mode 100644
index b0c03187435..00000000000
--- a/ghost/admin/app/components/modals/newsletters/edit/preview.hbs
+++ /dev/null
@@ -1,124 +0,0 @@
-<div class="gh-members-emailpreview">
-    <div class="gh-members-emailpreview-container">
-        <div class="gh-members-emailpreview-faux">
-            <p>
-                <span class="strong">{{or @newsletter.senderName this.settings.title}}</span> &lt;{{full-email-address (or @newsletter.senderEmail "noreply")}}&gt;
-            </p>
-            <p><span class="dark">To:</span> Jamie Larson &lt;jamie@example.com&gt;</p>
-        </div>
-        <div class="gh-members-emailpreview-contents">
-            {{#if @newsletter.headerImage}}
-                <div class="gh-members-emailpreview-header-image">
-                    <img src={{@newsletter.headerImage}} alt="" role="presentation">
-                </div>
-            {{/if}}
-            {{#if this.showHeader}}
-                <div class={{if (or (not @newsletter.showPostTitleSection) this.showHeaderTitle) "gh-members-emailpreview-header bordered" "gh-members-emailpreview-header"}}>
-                    {{#if (and this.settings.icon @newsletter.showHeaderIcon)}}
-                        <img src={{this.settings.icon}} alt="" role="presentation" />
-                    {{/if}}
-                    {{#if this.headerTitle}}
-                        <h4>{{this.headerTitle}}</h4>
-                    {{/if}}
-                    {{#if this.headerSubtitle}}
-                        <h5>{{this.headerSubtitle}}</h5>
-                    {{/if}}
-                </div>
-            {{/if}}
-            {{#if @newsletter.showPostTitleSection}}
-                <div class="gh-members-emailpreview-title {{if (eq @newsletter.titleAlignment "left") "gh-members-emailpreview-title-left"}}">
-                    <h2 class="{{if (eq @newsletter.titleFontCategory "serif") "serif"}}">Your email newsletter</h2>
-                    <div class="gh-members-emailpreview-meta {{if (eq @newsletter.titleAlignment "center") "center-aligned"}}">
-                        <p>By {{or this.session.user.name this.session.user.email}}
-                            <span>{{moment-format (moment-site-tz) "D MMM YYYY"}}</span>
-                            {{#if this.showCommentCta}}
-                                <span><a href="javascript:" class="gh-members-emailpreview-comment-link"> {{svg-jar "comment"}}</a></span>
-                            {{/if}}
-                        </p>
-                        <p>
-                            <a href="javascript:" class="gh-members-emailpreview-view-online">View in browser</a>
-                        </p>
-                    </div>
-                </div>
-            {{/if}}
-            {{#if @newsletter.showFeatureImage}}
-                <div class="gh-members-emailpreview-featureimage" style={{this.featureImageStyle}}></div>
-                <div class="gh-members-emailpreview-featureimage-caption">Feature image caption</div>
-            {{/if}}
-            <div class="gh-members-emailpreview-content {{if (eq @newsletter.bodyFontCategory "sans_serif") "sans-serif"}}">
-                <p>This is what your content will look like when you send one of your posts as an email newsletter to your subscribers.</p>
-                <p>Over there on the left you’ll see some settings that allow you to customize the look and feel of this template to make it perfectly suited to your brand. Email templates are exceptionally finnicky to make, but we’ve spent a long time optimising this one to make it work beautifully across devices, email clients and content types.</p>
-                <p>So, you can trust that every email you send with Ghost will look great and work well. Just like the rest of your site.</p>
-            </div>
-
-            {{#if (or (and @newsletter.feedbackEnabled (feature "audienceFeedback")) this.showCommentCta)}}
-                <div class="gh-members-emailpreview-feedback">
-                    <div class="gh-members-emailpreview-feedback-buttons-group">
-                        {{#if (and @newsletter.feedbackEnabled (feature "audienceFeedback"))}}
-                            <Modals::Newsletters::Components::FeedbackButton
-                                @text="More like this"
-                                @icon="thumbs-up" />
-
-                            <Modals::Newsletters::Components::FeedbackButton
-                                @text="Less like this"
-                                @icon="thumbs-down" />
-                        {{/if}}
-
-                        {{#if this.showCommentCta}}
-                            <Modals::Newsletters::Components::FeedbackButton
-                                @text="Comment"
-                                @icon="comment" />
-                        {{/if}}
-                    </div>
-                </div>
-            {{/if}}
-
-            {{#if @newsletter.showLatestPosts}}
-                <div class="gh-members-emailpreview-latest-posts">
-                    <h3 class="pb2">Keep reading</h3>
-                    <Modals::Newsletters::Components::LatestPost
-                        @imgPath="assets/img/latest-posts-1.png"
-                        @postTitle="The three latest posts published on your site"
-                        @postExcerpt="Posts sent as an email only will never be shown here." />
-                    <Modals::Newsletters::Components::LatestPost
-                        @imgPath="assets/img/latest-posts-2.png"
-                        @postTitle="Displayed at the bottom of each newsletter"
-                        @postExcerpt="Giving your readers one more place to discover your stories." />
-                    <Modals::Newsletters::Components::LatestPost
-                        @imgPath="assets/img/latest-posts-3.png"
-                        @postTitle="To keep your work front and center"
-                        @postExcerpt="Making sure that your audience stays engaged." />
-                </div>
-            {{/if}}
-
-            {{#if @newsletter.showSubscriptionDetails}}
-                <div class="gh-members-emailpreview-subscription-details">
-                    <h4 class="pb2">Subscription details</h4>
-                    <p class="pb4">You are receiving this because you are a <strong>paid subscriber</strong> to The Local Host. Your subscription will renew on {{this.renewDateString}}.</p>
-                    <div class="flex">
-                        <div class="flex-shrink-0">
-                            <p>Name: Jamie Larson</p>
-                            <p>Email: jamie@example.com</p>
-                            <p>Member since: {{this.todayString}}</p>
-                        </div>
-                        <a href="#" class="gh-members-emailpreview-subscription-link">Manage subscription &rarr;</a>
-                    </div>
-                </div>
-            {{/if}}
-
-            <div class="gh-members-emailpreview-footer">
-                <div class="gh-members-emailpreview-footercontent">
-                    {{html-safe @newsletter.footerContent}}
-                </div>
-                <div class="gh-members-emailpreview-footersite">
-                    <span>{{this.settings.title}} &copy; {{moment-format (moment-site-tz) "YYYY"}} – </span> <a href="javascript:">Unsubscribe</a>
-                </div>
-            </div>
-            <div class="gh-members-emailpreview-badge {{unless @newsletter.showBadge "hide"}}">
-                <a href="javascript:"><svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-                <path fill-rule="evenodd" clip-rule="evenodd" d="M24 12C24 18.6274 18.6274 24 12 24C5.37258 24 0 18.6274 0 12C0 5.37258 5.37258 0 12 0C18.6274 0 24 5.37258 24 12ZM11.8326 2.33879C6.37785 2.95189 3.95901 5.20797 3.41126 9.74699C3.34896 10.2632 3.22642 10.7805 3.10443 11.2954C2.93277 12.02 2.76221 12.74 2.76221 13.4458C2.76221 17.9885 6.5856 21.556 11.1283 21.556C12.8959 21.556 14.4433 20.8144 15.8756 20.048C19.0536 18.3478 22.0328 16.2597 22.0328 12.5411C22.0328 9.91512 20.1051 7.56932 18.466 5.5747C18.3834 5.47416 18.3015 5.37451 18.2206 5.27577C17.3866 4.25742 14.4333 2.04643 11.8326 2.33879Z" fill="black"/>
-                </svg> <span>Powered by Ghost</span></a>
-            </div>
-        </div>
-    </div>
-</div>
diff --git a/ghost/admin/app/components/modals/newsletters/edit/preview.js b/ghost/admin/app/components/modals/newsletters/edit/preview.js
deleted file mode 100644
index bfcded16893..00000000000
--- a/ghost/admin/app/components/modals/newsletters/edit/preview.js
+++ /dev/null
@@ -1,62 +0,0 @@
-import Component from '@glimmer/component';
-import config from 'ghost-admin/config/environment';
-import moment from 'moment-timezone';
-import {htmlSafe} from '@ember/template';
-import {inject as service} from '@ember/service';
-
-export default class EditNewsletterPreview extends Component {
-    @service ghostPaths;
-    @service session;
-    @service settings;
-    @service membersUtils;
-
-    get showHeader() {
-        return (this.args.newsletter.showHeaderIcon && this.settings.icon)
-            || this.headerTitle;
-    }
-
-    get showHeaderTitle() {
-        return this.headerTitle || this.headerSubtitle;
-    }
-
-    get showCommentCta() {
-        return this.args.newsletter.showCommentCta && this.settings.commentsEnabled !== 'off';
-    }
-
-    get headerTitle() {
-        if (this.args.newsletter.showHeaderTitle) {
-            return this.settings.title;
-        } else if (this.args.newsletter.showHeaderName) {
-            return this.args.newsletter.name;
-        }
-
-        return null;
-    }
-
-    get headerSubtitle() {
-        if (this.args.newsletter.showHeaderTitle && this.args.newsletter.showHeaderName) {
-            return this.args.newsletter.name;
-        }
-
-        return null;
-    }
-
-    get featureImageUrl() {
-        // keep path separate so asset rewriting correctly picks it up
-        const imagePath = '/img/user-cover.png';
-        const fullPath = (config.cdnUrl ? '' : this.ghostPaths.assetRoot.replace(/\/$/, '')) + imagePath;
-        return fullPath;
-    }
-
-    get featureImageStyle() {
-        return htmlSafe(`background-image: url(${this.featureImageUrl})`);
-    }
-
-    get renewDateString() {
-        return moment().add(1, 'year').format('DD MMM YYYY');
-    }
-
-    get todayString() {
-        return moment().format('DD MMM YYYY');
-    }
-}
diff --git a/ghost/admin/app/components/modals/newsletters/edit/settings.hbs b/ghost/admin/app/components/modals/newsletters/edit/settings.hbs
deleted file mode 100644
index 357be647987..00000000000
--- a/ghost/admin/app/components/modals/newsletters/edit/settings.hbs
+++ /dev/null
@@ -1,123 +0,0 @@
-<fieldset class="modal-fullsettings-form-labs">
-    <div class="modal-fullsettings-section-labs">
-        <h4 class="modal-fullsettings-section-title">General settings</h4>
-
-        {{#let (eq @openSection "name") as |isOpen|}}
-            <button class="modal-fullsettings-tab {{if isOpen "active"}}" type="button" {{on "click" (fn @toggleSection "name")}} data-test-nav-toggle="general.name">
-                {{svg-jar "email-name"}} Name and description
-                <span class="gh-nav-button-expand">{{svg-jar (if isOpen "arrow-up-stroke" "arrow-down-stroke")}}</span>
-            </button>
-            {{#liquid-if isOpen}}
-                <div class="modal-fullsettings-tab-expanded">
-                    <div class="gh-stack">
-                        <GhFormGroup class="gh-stack-item" @errors={{@newsletter.errors}} @hasValidated={{@newsletter.hasValidated}} @property="name">
-                            <label for="newsletter-title" class="modal-fullsettings-title">Name</label>
-                            <input
-                                id="newsletter-title"
-                                type="text"
-                                class="gh-input miw-100 form-text"
-                                value={{@newsletter.name}}
-                                placeholder="Weekly Roundup"
-                                {{on "input" (fn this.onInput "name")}}
-                            />
-                            <GhErrorMessage @errors={{@newsletter.errors}} @property="name" />
-                        </GhFormGroup>
-
-                        <GhFormGroup class="gh-stack-item" @errors={{@newsletter.errors}} @hasValidated={{@newsletter.hasValidated}} @property="description">
-                            <label for="newsletter-description" class="modal-fullsettings-title">Description</label>
-                            <textarea
-                                id="newsletter-description"
-                                class="gh-input miw-100 form-text"
-                                {{on "input" (fn this.onInput "description")}}
-                            >{{@newsletter.description}}</textarea>
-                            <GhErrorMessage @errors={{@newsletter.errors}} @property="description" />
-                        </GhFormGroup>
-                    </div>
-                </div>
-            {{/liquid-if}}
-        {{/let}}
-
-        {{#let (eq @openSection "email") as |isOpen|}}
-            <button class="modal-fullsettings-tab {{if isOpen "active"}}" type="button" {{on "click" (fn @toggleSection "email")}} data-test-nav-toggle="general.email">
-                {{svg-jar "email-at"}} Email addresses
-                <span class="gh-nav-button-expand">{{svg-jar (if isOpen "arrow-up-stroke" "arrow-down-stroke")}}</span>
-            </button>
-            {{#liquid-if isOpen}}
-                <div class="modal-fullsettings-tab-expanded">
-                    <div class="gh-stack">
-                        <GhFormGroup class="gh-stack-item" @errors={{@newsletter.errors}} @hasValidated={{@newsletter.hasValidated}} @property="senderName">
-                            <label for="newsletter-sender-name" class="modal-fullsettings-title">Sender name</label>
-                            <input
-                                id="newsletter-sender-name"
-                                type="text"
-                                class="gh-input miw-100 form-text"
-                                value={{@newsletter.senderName}}
-                                placeholder={{this.settings.title}}
-                                {{on "input" (fn this.onInput "senderName")}}
-                            />
-                            <GhErrorMessage @errors={{@newsletter.errors}} @property="senderName" />
-                        </GhFormGroup>
-
-                        <GhFormGroup class="gh-stack-item"  @errors={{@newsletter.errors}} @hasValidated={{@newsletter.hasValidated}} @property="senderEmail">
-                            <span class="flex items-center justify-between">
-                                <label for="newsletter-sender-email" class="modal-fullsettings-title ml2">Sender email address</label>
-                                <span class="tooltip-top-left" data-tooltip="Defaults to {{full-email-address "noreply"}} if empty">{{svg-jar "info" class="w4 h4"}}</span>
-                            </span>
-                            <input
-                                id="newsletter-sender-email"
-                                type="text"
-                                class="gh-input miw-100 form-text"
-                                value={{@newsletter.senderEmail}}
-                                placeholder={{full-email-address "noreply"}}
-                                {{on "input" (fn this.onInput "senderEmail")}}
-                            />
-                            <GhErrorMessage @errors={{@newsletter.errors}} @property="senderEmail" />
-                        </GhFormGroup>
-
-                        <GhFormGroup class="gh-stack-item" @errors={{@newsletter.errors}} @hasValidated={{@newsletter.hasValidated}} @property="senderReplyTo">
-                            <label for="newsletter-reply-to" class="modal-fullsettings-title">Reply-to email</label>
-                            <Inputs::Select
-                                id="newsletter-reply-to"
-                                @value={{@newsletter.senderReplyTo}}
-                                @onChange={{fn this.onValueChange "senderReplyTo"}}
-                                as |select|
-                            >
-                                <select.option @value="newsletter">Newsletter address ({{full-email-address (or @newsletter.senderEmail "noreply")}})</select.option>
-                                <select.option @value="support">Support address ({{full-email-address this.settings.membersSupportAddress}})</select.option>
-                            </Inputs::Select>
-                            <GhErrorMessage @errors={{@newsletter.errors}} @property="senderReplyTo" />
-                        </GhFormGroup>
-                    </div>
-                </div>
-            {{/liquid-if}}
-        {{/let}}
-
-        {{#let (eq @openSection "members") as |isOpen|}}
-            <button class="modal-fullsettings-tab {{if isOpen "active"}}" type="button" {{on "click" (fn @toggleSection "members")}} data-test-nav-toggle="general.member">
-                {{svg-jar "email-member"}} Member settings
-                <span class="gh-nav-button-expand">{{svg-jar (if isOpen "arrow-up-stroke" "arrow-down-stroke")}}</span>
-            </button>
-            {{#liquid-if isOpen}}
-                <div class="modal-fullsettings-tab-expanded">
-                    <div class="gh-stack">
-                        <GhFormGroup class="gh-stack-item gh-setting">
-                            <label for="subscribe-on-signup" class="modal-fullsettings-title" data-test-toggle="subscribeOnSignup">Subscribe new members on signup</label>
-                            <div class="for-switch small">
-                                <div class="container">
-                                    <input
-                                        type="checkbox"
-                                        id="subscribe-on-signup"
-                                        checked={{@newsletter.subscribeOnSignup}}
-                                        {{on "change" (fn this.onCheckboxChange "subscribeOnSignup")}}
-                                    >
-                                    <button type="button" class="input-toggle-component" {{on "click" (fn this.toggleProperty "subscribeOnSignup")}}></button>
-                                </div>
-                            </div>
-                        </GhFormGroup>
-                    </div>
-                </div>
-            {{/liquid-if}}
-        {{/let}}
-
-    </div>
-</fieldset>
diff --git a/ghost/admin/app/components/modals/newsletters/edit/settings.js b/ghost/admin/app/components/modals/newsletters/edit/settings.js
deleted file mode 100644
index 1ea115e1a69..00000000000
--- a/ghost/admin/app/components/modals/newsletters/edit/settings.js
+++ /dev/null
@@ -1,37 +0,0 @@
-import Component from '@glimmer/component';
-import {action} from '@ember/object';
-import {inject as service} from '@ember/service';
-
-export default class EditNewsletterSettingsForm extends Component {
-    @service settings;
-
-    @action
-    onCheckboxChange(property, event) {
-        this.args.newsletter[property] = event.target.checked;
-    }
-
-    @action
-    toggleProperty(property) {
-        this.args.newsletter[property] = !this.args.newsletter[property];
-    }
-
-    @action
-    onInput(property, event) {
-        this.args.newsletter[property] = event.target.value;
-    }
-
-    @action
-    onValueChange(property, value) {
-        this.args.newsletter[property] = value;
-    }
-
-    @action
-    setOptInExisting(event) {
-        this.args.setOptInExisting(event.target.value);
-    }
-
-    @action
-    toggleOptInExisting() {
-        this.args.setOptInExisting(!this.args.optInExisting);
-    }
-}
diff --git a/ghost/admin/app/components/modals/newsletters/new.hbs b/ghost/admin/app/components/modals/newsletters/new.hbs
deleted file mode 100644
index 5645bc32707..00000000000
--- a/ghost/admin/app/components/modals/newsletters/new.hbs
+++ /dev/null
@@ -1,78 +0,0 @@
-<div class="modal-content" data-test-modal="create-newsletter">
-    <header class="modal-header">
-        <h1>Create newsletter</h1>
-    </header>
-    <button type="button" class="close" title="Close" {{on "click" @close}}>{{svg-jar "close"}}<span class="hidden">Close</span></button>
-
-    <div class="modal-body">
-        <fieldset>
-            <GhFormGroup @errors={{@data.newsletter.errors}} @hasValidated={{@data.newsletter.hasValidated}} @property="name">
-                <label for="newsletter-title" class="modal-fullsettings-title">Name</label>
-                <input
-                    id="newsletter-title"
-                    type="text"
-                    class="gh-input miw-100 form-text"
-                    value={{@data.newsletter.name}}
-                    placeholder="Weekly Roundup"
-                    data-test-newsletter-title-input
-                    {{on "input" (fn this.onInput "name")}}
-                />
-                <GhErrorMessage @errors={{@data.newsletter.errors}} @property="name" />
-            </GhFormGroup>
-
-            <GhFormGroup @errors={{@data.newsletter.errors}} @hasValidated={{@data.newsletter.hasValidated}} @property="description">
-                <label for="newsletter-description" class="modal-fullsettings-title">Description</label>
-                <textarea
-                    id="newsletter-description"
-                    class="gh-input miw-100 form-text"
-                    {{on "input" (fn this.onInput "description")}}
-                >{{@data.newsletter.description}}</textarea>
-                <GhErrorMessage @errors={{@data.newsletter.errors}} @property="description" />
-            </GhFormGroup>
-
-            <GhFormGroup class="flex justify-between items-start mb2">
-                <div class="mr3">
-                    <label for="opt-in-existing" class="modal-fullsettings-title">Opt-in existing subscribers</label>
-                    <p>
-                    {{#if this.optInExisting}}
-                        {{#let (members-count-fetcher query=(hash filter="newsletters.status:active+email_disabled:0")) as |countFetcher|}}
-                            This newsletter will be available to <strong>all members</strong>. Your {{#if countFetcher.count}}<strong>{{countFetcher.count}}</strong>{{/if}} existing subscriber{{#if (gt countFetcher.count 1)}}s{{/if}} will also be opted-in to receive it.
-                        {{/let}}
-                    {{else}}
-                        The newsletter will be available to <strong>all new members</strong>. Existing members won’t be subscribed, but may visit their account area to opt-in to future emails.
-                    {{/if}}
-                    </p>
-                </div>
-                <div class="for-switch small">
-                    <div class="container">
-                        <input
-                            type="checkbox"
-                            id="opt-in-existing"
-                            checked={{this.optInExisting}}
-                            {{on "check" this.setOptInExisting}}
-                        >
-                        <button type="button" class="input-toggle-component" {{on "click" this.toggleOptInExisting}}></button>
-                    </div>
-                </div>
-            </GhFormGroup>
-        </fieldset>
-    </div>
-
-    <div class="modal-footer">
-        <button class="gh-btn" type="button" {{on "click" @close}}>
-            <span>Cancel</span>
-        </button>
-
-        <GhTaskButton
-            @buttonText="Create"
-            @runningText="Creating"
-            @successText="Created"
-            @task={{this.saveTask}}
-            @idleClass="gh-btn-primary"
-            @class="gh-btn gh-btn-icon"
-            {{on-key "cmd+s" this.saveViaKeyboard priority=1}}
-            {{on-key "Enter" this.saveViaKeyboard priority=1}}
-            data-test-button="save-newsletter"
-        />
-    </div>
-</div>
diff --git a/ghost/admin/app/components/modals/newsletters/new.js b/ghost/admin/app/components/modals/newsletters/new.js
deleted file mode 100644
index 0661e7189d0..00000000000
--- a/ghost/admin/app/components/modals/newsletters/new.js
+++ /dev/null
@@ -1,75 +0,0 @@
-import Component from '@glimmer/component';
-import {action} from '@ember/object';
-import {inject as service} from '@ember/service';
-import {task} from 'ember-concurrency';
-import {tracked} from '@glimmer/tracking';
-
-export default class NewNewsletterModal extends Component {
-    @service modals;
-    @service store;
-
-    @tracked optInExisting = this.args.data.newsletter.isNew;
-
-    willDestroy() {
-        super.willDestroy(...arguments);
-        this.args.data.newsletter.rollbackAttributes();
-    }
-
-    @action
-    onInput(property, event) {
-        this.args.data.newsletter[property] = event.target.value;
-    }
-
-    @action
-    saveViaKeyboard(event, responder) {
-        responder.stopPropagation();
-        event.preventDefault();
-
-        this.saveTask.perform();
-    }
-
-    @action
-    setOptInExisting(event) {
-        this.optInExisting = event.target.value;
-    }
-
-    @action
-    toggleOptInExisting() {
-        this.optInExisting = !this.optInExisting;
-    }
-
-    @task
-    *saveTask() {
-        const newsletter = this.args.data.newsletter;
-        try {
-            yield newsletter.validate({});
-
-            const result = yield newsletter.save({
-                adapterOptions: {optInExisting: this.optInExisting}
-            });
-
-            // Re-fetch newsletter data to refresh counts
-            yield this.store.query('newsletter', {include: 'count.active_members,count.posts', limit: 'all'});
-            this.args.data.afterSave?.(result);
-
-            return result;
-        } catch (error) {
-            if (error === undefined) {
-                // Validation error
-                return;
-            }
-
-            // Do we have an error that we can show inline?
-            if (error.payload && error.payload.errors) {
-                for (const payloadError of error.payload.errors) {
-                    if (payloadError.type === 'ValidationError' && payloadError.property && (payloadError.context || payloadError.message)) {
-                        // Context has a better error message for validation errors
-                        newsletter.errors.add(payloadError.property, payloadError.context || payloadError.message);
-                    }
-                }
-            }
-
-            throw error;
-        }
-    }
-}
diff --git a/ghost/admin/app/components/modals/newsletters/verify-newsletter-email.hbs b/ghost/admin/app/components/modals/newsletters/verify-newsletter-email.hbs
deleted file mode 100644
index e0f551b6602..00000000000
--- a/ghost/admin/app/components/modals/newsletters/verify-newsletter-email.hbs
+++ /dev/null
@@ -1,40 +0,0 @@
-<div class="modal-content">
-    <header class="modal-header" data-test-modal="verify-newsletter-email">
-        {{#if this.verifyEmailTask.isRunning}}
-            <h1>Verifying newsletter email address</h1>
-        {{else if this.newsletter}}
-            <h1>Email address verified</h1>
-        {{else if this.error}}
-            <h1>Email address verification failed</h1>
-        {{/if}}
-    </header>
-    <button type="button" class="close" title="Close" {{on "click" @close}}>{{svg-jar "close"}}<span class="hidden">Close</span></button>
-
-    <div class="modal-body">
-        {{#if this.verifyEmailTask.isRunning}}
-            <div class="flex justify-center flex-auto">
-                <div class="gh-loading-spinner"></div>
-            </div>
-        {{else if this.newsletter}}
-            <p>
-                Success! From address for newsletter
-                <LinkTo @route="settings.newsletters.edit-newsletter" @model={{this.newsletter.id}}>{{this.newsletter.name}}</LinkTo>
-                changed to <strong>{{this.newsletter.senderEmail}}</strong>
-            </p>
-        {{else if this.error}}
-            <p>Verification failed:</p>
-            <p>{{this.error}}</p>
-        {{/if}}
-    </div>
-
-    <div class="modal-footer">
-        <button
-            type="button"
-            class="gh-btn"
-            {{on "click" @close}}
-            {{on-key "Enter"}}
-        >
-            <span>Ok</span>
-        </button>
-    </div>
-</div>
diff --git a/ghost/admin/app/components/modals/newsletters/verify-newsletter-email.js b/ghost/admin/app/components/modals/newsletters/verify-newsletter-email.js
deleted file mode 100644
index 072cbbe5653..00000000000
--- a/ghost/admin/app/components/modals/newsletters/verify-newsletter-email.js
+++ /dev/null
@@ -1,49 +0,0 @@
-import Component from '@glimmer/component';
-import {action} from '@ember/object';
-import {inject as service} from '@ember/service';
-import {task} from 'ember-concurrency';
-import {tracked} from '@glimmer/tracking';
-
-export default class VerifyNewsletterEmail extends Component {
-    @service ajax;
-    @service ghostPaths;
-    @service router;
-    @service store;
-
-    @tracked error = null;
-    @tracked newsletter = null;
-
-    constructor() {
-        super(...arguments);
-        this.verifyEmailTask.perform(this.args.data.token);
-
-        this.router.on('routeDidChange', this.handleRouteChange);
-    }
-
-    willDestroy() {
-        super.willDestroy(...arguments);
-        this.router.off('routeDidChange', this.handleRouteChange);
-    }
-
-    @task
-    *verifyEmailTask(token) {
-        try {
-            const url = this.ghostPaths.url.api('newsletters', 'verifications');
-
-            const response = yield this.ajax.put(url, {data: {token}});
-
-            if (response.newsletters) {
-                this.store.pushPayload('newsletter', response);
-                const newsletter = this.store.peekRecord('newsletter', response.newsletters[0].id);
-                this.newsletter = newsletter;
-            }
-        } catch (e) {
-            this.error = e.message;
-        }
-    }
-
-    @action
-    handleRouteChange() {
-        this.args.close();
-    }
-}
diff --git a/ghost/admin/app/components/modals/settings/confirm-email.hbs b/ghost/admin/app/components/modals/settings/confirm-email.hbs
deleted file mode 100644
index 7b6d3472eac..00000000000
--- a/ghost/admin/app/components/modals/settings/confirm-email.hbs
+++ /dev/null
@@ -1,21 +0,0 @@
-<div class="modal-content" data-test-modal="confirm-email">
-    <header class="modal-header">
-        <h1>Confirm email address</h1>
-    </header>
-    <button type="button" class="close" title="Close" {{on "click" @close}}>{{svg-jar "close"}}<span
-            class="hidden">Close</span></button>
-
-    <div class="modal-body">
-        <p>
-            We've sent a confirmation email to <strong>{{@data.newEmail}}</strong>.
-            Until verified, your support address will remain  {{full-email-address (or @data.currentEmail
-            "noreply")}}.
-        </p>
-    </div>
-
-    <div class="modal-footer">
-        <button type="button" class="gh-btn" data-test-button="confirm-email" {{on "click" @close}} {{on-key "Enter" }}>
-            <span>Ok</span>
-        </button>
-    </div>
-</div>
diff --git a/ghost/admin/app/components/modals/settings/signup-form-embed.hbs b/ghost/admin/app/components/modals/settings/signup-form-embed.hbs
deleted file mode 100644
index 4b3bf6852e1..00000000000
--- a/ghost/admin/app/components/modals/settings/signup-form-embed.hbs
+++ /dev/null
@@ -1,83 +0,0 @@
-<div class="modal-content modal-signup-form-embed" data-test-modal="signup-form-embed">
-    <button type="button" class="close" title="Close" {{on "click" @close}}>{{svg-jar "close"}}<span class="hidden">Close</span></button>
-
-    <div class="modal-signup-form-embed-preview">
-        <Settings::SignupForm::Preview
-            @html={{this.previewCode}}
-            @style={{this.style}}
-        />
-    </div>
-
-    <div class="modal-signup-form-embed-main">
-        <header class="modal-header">
-            <h1>Embed signup form</h1>
-        </header>
-
-        <div class="modal-body">
-            <GhFormGroup class="gh-signup-form-container">
-                <div class="gh-stack-item row">
-                    <label class="modal-fullsettings-title">
-                        Layout
-                    </label>
-                        <Settings::SignupForm::StyleSelect
-                        @value={{this.style}}
-                        @onChange={{this.setStyle}}
-                    />
-                </div>
-
-                {{#unless (eq this.style 'minimal')}}
-                    <div class="gh-stack-item row">
-                        <label class="modal-fullsettings-title">
-                            Background color
-                        </label>
-                        <Modals::Newsletters::Components::ColorPicker
-                            @color={{this.backgroundColor}}
-                            @presetColors={{this.backgroundPresetColors}}
-                            @onColorChange={{this.setBackgroundColor}}
-                        />
-                    </div>
-                {{/unless}}
-
-                <div class="gh-stack-item">
-                    <label class="modal-fullsettings-title">
-                        Labels at signup
-                    </label>
-                    <GhMemberLabelInput
-                        @onChange={{this.setLabels}}
-                        @allowEdit={{false}}
-                        @labels={{this.labels}}
-                        @triggerId="label-input"
-                        @placeholder="Select"
-                        @renderInPlace={{false}}
-                    />
-                </div>
-
-                <div class="gh-stack-item">
-                    <div class="flex-grow-1">
-                        <label class="modal-fullsettings-title">
-                            Embed code
-                        </label>
-                        <GhTextarea
-                            @id="gh-signup-form-embed-code-input"
-                            @class="gh-input gh-signup-form-embed-code-input"
-                            @value={{this.generatedCode}}
-                            readonly
-                            {{on "mouseup" this.copyTextOnMouseUp}}
-                        />
-                        <p>Paste this code onto any website where you'd like your signup to appear.</p>
-                    </div>
-                </div>
-            </GhFormGroup>
-
-        </div>
-
-        <div class="modal-footer">
-            <GhTaskButton
-                @buttonText="Copy code"
-                @task={{this.copyText}}
-                @successText="Copied"
-                @class="gh-btn gh-btn-black gh-btn-icon"
-            />
-        </div>
-    </div>
-</div>
diff --git a/ghost/admin/app/components/modals/settings/signup-form-embed.js b/ghost/admin/app/components/modals/settings/signup-form-embed.js
deleted file mode 100644
index a5eb54fb73a..00000000000
--- a/ghost/admin/app/components/modals/settings/signup-form-embed.js
+++ /dev/null
@@ -1,183 +0,0 @@
-import Component from '@glimmer/component';
-import trackEvent from '../../../utils/analytics';
-import {action} from '@ember/object';
-import {inject} from 'ghost-admin/decorators/inject';
-import {inject as service} from '@ember/service';
-import {task} from 'ember-concurrency';
-import {textColorForBackgroundColor} from '@tryghost/color-utils';
-import {tracked} from '@glimmer/tracking';
-
-function escapeHtml(unsafe) {
-    if (!unsafe) {
-        return '';
-    }
-    return unsafe
-        .replace(/&/g, '&amp;')
-        .replace(/</g, '&lt;')
-        .replace(/>/g, '&gt;')
-        .replace(/"/g, '&quot;')
-        .replace(/'/g, '&#039;');
-}
-
-export default class SignupFormEmbedModal extends Component {
-    @service modals;
-    @service settings;
-    @service feature;
-    @tracked style = 'all-in-one';
-    @tracked labels = [];
-    @tracked backgroundColor = '#F1F3F4';
-    @inject config;
-
-    static modalOptions = {
-        className: 'fullwidth-modal gh-signup-form-embed'
-    };
-
-    @action
-    setStyle(style) {
-        this.style = style;
-    }
-
-    @action
-    setLabels(labels) {
-        this.labels = labels;
-    }
-
-    @action
-    setBackgroundColor(backgroundColor) {
-        this.backgroundColor = backgroundColor;
-    }
-
-    get backgroundPresetColors() {
-        return [
-            {
-                value: '#F1F3F4',
-                name: 'Light grey',
-                class: '',
-                style: 'background: #F1F3F4 !important;'
-            },
-            {
-                value: '#000000',
-                name: 'Black',
-                class: '',
-                style: 'background: #000000 !important;'
-            },
-            {
-                value: this.settings.accentColor,
-                name: 'Accent',
-                class: '',
-                style: 'background: ' + this.settings.accentColor + ' !important;'
-            }
-        ];
-    }
-
-    get generatedCode() {
-        return this.generateCode({preview: false});
-    }
-
-    get previewCode() {
-        return this.generateCode({preview: true});
-    }
-
-    generateCode({preview}) {
-        const siteUrl = this.config.blogUrl;
-        const scriptUrl = this.config.signupForm.url.replace('{version}', this.config.signupForm.version);
-
-        const options = {
-            site: siteUrl,
-            'button-color': this.settings.accentColor,
-            'button-text-color': textColorForBackgroundColor(this.settings.accentColor).hex()
-        };
-
-        if (this.feature.get('i18n')) {
-            options.locale = this.settings.locale;
-        }
-
-        for (const [i, label] of this.labels.entries()) {
-            options[`label-${i + 1}`] = label.name;
-        }
-
-        let style = 'min-height: 58px;max-width: 440px;margin: 0 auto;width: 100%';
-
-        if (this.style === 'all-in-one') {
-            // We serve twice the size of the icon to support high resolution screens
-            // (note that you'll need to change the resolution in the backend config as well, as not all resolutions are supported)
-            if (this.settings.icon || !this.settings.icon === '') {
-                options.icon = this.settings.icon.replace(/\/content\/images\//, '/content/images/size/w192h192/');
-            }
-            options.title = this.settings.title;
-            options.description = this.settings.description;
-
-            options['background-color'] = this.backgroundColor;
-            options['text-color'] = textColorForBackgroundColor(this.backgroundColor).hex();
-
-            style = 'height: 40vmin;min-height: 360px';
-        }
-
-        if (preview) {
-            if (this.style === 'minimal') {
-                style = 'min-height: 58px; max-width: 440px;width: 100%;position: absolute; left: 50%; top:50%; transform: translate(-50%, -50%);';
-            } else {
-                style = 'height: 100vh';
-            }
-        }
-
-        let dataOptionsString = '';
-        const preferredOrder = [
-            'background-color',
-            'text-color',
-            'button-color',
-            'button-text-color',
-            'title',
-            'description',
-            'icon',
-            'site',
-            'locale'
-        ];
-        const sortedKeys = Object.keys(options).sort((a, b) => {
-            return preferredOrder.indexOf(a) - preferredOrder.indexOf(b);
-        });
-        for (const key of sortedKeys) {
-            const value = options[key];
-            dataOptionsString += ` data-${key}="${escapeHtml(value)}"`;
-        }
-
-        const code = `<div style="${escapeHtml(style)}"><script src="${encodeURI(scriptUrl)}"${dataOptionsString} async></script></div>`;
-
-        if (preview && this.style === 'minimal') {
-            // Add background
-            return `<div style="position: absolute; z-index: -1; top: 0; left: 0; width: 100%; height: 100%; background-image: linear-gradient(45deg, #eee 25%, transparent 25%, transparent 75%, #eee 75%), linear-gradient(45deg, #eee 25%, transparent 25%, transparent 75%, #eee 75%);background-size: 16px 16px;background-position: 0 0, 8px 8px;;"></div>${code}`;
-        }
-
-        return code;
-    }
-
-    doCopy() {
-        // Copy this.generatedCode tp the clipboard
-        const el = document.getElementById('gh-signup-form-embed-code-input');
-        el.select();
-        document.execCommand('copy');
-
-        trackEvent('Copied Embeddable Signup Form Code', {style: this.style, labels: this.labels.length});
-    }
-
-    /**
-     * Calling this task will make the button green, so avoid using if you don't want that
-     */
-    @task
-    *copyText() {
-        // Copy this.generatedCode tp the clipboard
-        this.doCopy();
-
-        yield true;
-        return true;
-    }
-
-    @action
-    copyTextOnMouseUp() {
-        // Check if there is no current text selection anywhere on the page, otherwise skip copying
-        // This is so users can still select text manually without copying automatically
-        if (window.getSelection().toString() === '') {
-            this.doCopy();
-        }
-    }
-}
diff --git a/ghost/admin/app/components/modals/settings/verify-email.hbs b/ghost/admin/app/components/modals/settings/verify-email.hbs
deleted file mode 100644
index fe28c422544..00000000000
--- a/ghost/admin/app/components/modals/settings/verify-email.hbs
+++ /dev/null
@@ -1,32 +0,0 @@
-<div class="modal-content">
-    <header class="modal-header" data-test-modal="verify-email">
-        <h1>Verifying email address</h1>
-    </header>
-    <button type="button" class="close" title="Close" {{on "click" @close}}>{{svg-jar "close"}}<span class="hidden">Close</span></button>
-
-    <div class="modal-body">
-        {{#if this.verifyEmailTask.isRunning}}
-            <div class="flex justify-center flex-auto">
-                <div class="gh-loading-spinner"></div>
-            </div>
-        {{else if this.email}}
-            <p>
-                Success! The support email address has changed to <strong>{{this.email}}</strong>
-            </p>
-        {{else if this.error}}
-            <p>Verification failed:</p>
-            <p>{{this.error}}</p>
-        {{/if}}
-    </div>
-
-    <div class="modal-footer">
-        <button
-            type="button"
-            class="gh-btn"
-            {{on "click" @close}}
-            {{on-key "Enter"}}
-        >
-            <span>Ok</span>
-        </button>
-    </div>
-</div>
diff --git a/ghost/admin/app/components/modals/settings/verify-email.js b/ghost/admin/app/components/modals/settings/verify-email.js
deleted file mode 100644
index 5f5a9f8e4fd..00000000000
--- a/ghost/admin/app/components/modals/settings/verify-email.js
+++ /dev/null
@@ -1,46 +0,0 @@
-import Component from '@glimmer/component';
-import {action} from '@ember/object';
-import {inject as service} from '@ember/service';
-import {task} from 'ember-concurrency';
-import {tracked} from '@glimmer/tracking';
-
-export default class VerifyEmail extends Component {
-    @service ajax;
-    @service ghostPaths;
-    @service router;
-    @service store;
-    @service settings;
-
-    @tracked error = null;
-    @tracked email = null;
-
-    constructor() {
-        super(...arguments);
-        this.verifyEmailTask.perform(this.args.data.token);
-
-        this.router.on('routeDidChange', this.handleRouteChange);
-    }
-
-    willDestroy() {
-        super.willDestroy(...arguments);
-        this.router.off('routeDidChange', this.handleRouteChange);
-    }
-
-    @task
-    *verifyEmailTask(token) {
-        try {
-            const url = this.ghostPaths.url.api('settings', 'verifications');
-
-            yield this.ajax.put(url, {data: {token}});
-            yield this.settings.reload();
-            this.email = this.settings.membersSupportAddress;
-        } catch (e) {
-            this.error = e.message;
-        }
-    }
-
-    @action
-    handleRouteChange() {
-        this.args.close();
-    }
-}
diff --git a/ghost/admin/app/components/modals/tiers/archive.hbs b/ghost/admin/app/components/modals/tiers/archive.hbs
deleted file mode 100644
index fb1a2d97f53..00000000000
--- a/ghost/admin/app/components/modals/tiers/archive.hbs
+++ /dev/null
@@ -1,27 +0,0 @@
-
-<div class="modal-content" data-test-modal="archive-tier" {{on-key "Enter" (perform this.archiveTierTask)}}>
-    <header class="modal-header">
-        <h1>Archive tier</h1>
-    </header>
-    <button type="button" class="close" title="Close" {{on "click" @close}}>{{svg-jar "close"}}<span class="hidden">Close</span></button>
-
-    <div class="modal-body">
-        <p>
-            Members will no longer be able to subscribe to <strong>{{@data.tier.name}}</strong> and it will be removed from the list of available tiers in portal.
-        </p>
-        <p>
-            Existing members on this tier will remain unchanged.
-        </p>
-    </div>
-
-    <div class="modal-footer">
-        <button type="button" class="gh-btn" {{on "click" @close}}><span>Cancel</span></button>
-        <GhTaskButton
-            @buttonText="Archive"
-            @successText="Archived"
-            @task={{this.archiveTierTask}}
-            @class="gh-btn gh-btn-black gh-btn-icon"
-            data-test-button="archive-tier"
-        />
-    </div>
-</div>
diff --git a/ghost/admin/app/components/modals/tiers/archive.js b/ghost/admin/app/components/modals/tiers/archive.js
deleted file mode 100644
index 72598cff8b1..00000000000
--- a/ghost/admin/app/components/modals/tiers/archive.js
+++ /dev/null
@@ -1,32 +0,0 @@
-import Component from '@glimmer/component';
-import {inject as service} from '@ember/service';
-import {task} from 'ember-concurrency';
-
-export default class ArchiveTierModal extends Component {
-    @service notifications;
-    @service router;
-
-    get isActive() {
-        const {tier} = this.args.data;
-        return !!tier.active;
-    }
-
-    @task({drop: true})
-    *archiveTierTask() {
-        const {tier, onArchive} = this.args.data;
-        tier.active = false;
-        tier.visibility = 'none';
-
-        try {
-            yield tier.save();
-            onArchive?.();
-            return tier;
-        } catch (error) {
-            if (error) {
-                this.notifications.showAPIError(error, {key: 'tier.archive.failed'});
-            }
-        } finally {
-            this.args.close();
-        }
-    }
-}
diff --git a/ghost/admin/app/components/modals/tiers/unarchive.hbs b/ghost/admin/app/components/modals/tiers/unarchive.hbs
deleted file mode 100644
index 4544f05fbef..00000000000
--- a/ghost/admin/app/components/modals/tiers/unarchive.hbs
+++ /dev/null
@@ -1,26 +0,0 @@
-
-<div class="modal-content" data-test-modal="unarchive-tier" {{on-key "Enter" (perform this.unarchiveTask)}}>
-    <header class="modal-header">
-        <h1>Reactivate tier</h1>
-    </header>
-    <button type="button" class="close" title="Close" {{on "click" @close}}>{{svg-jar "close"}}<span class="hidden">Close</span></button>
-
-    <div class="modal-body">
-        <p>
-            Reactivating <strong>{{@data.tier.name}}</strong> will re-enable it as an option in portal and allow new members to subscribe to this tier.
-        </p>
-        <p>
-            Existing members will remain unchanged.
-        </p>
-    </div>
-
-    <div class="modal-footer">
-        <button type="button" class="gh-btn" {{on "click" @close}}><span>Cancel</span></button>
-        <GhTaskButton
-            @buttonText="Reactivate"
-            @task={{this.unarchiveTask}}
-            @class="gh-btn gh-btn-black gh-btn-icon"
-            data-test-button="unarchive-tier"
-        />
-    </div>
-</div>
diff --git a/ghost/admin/app/components/modals/tiers/unarchive.js b/ghost/admin/app/components/modals/tiers/unarchive.js
deleted file mode 100644
index a0b8aa14e55..00000000000
--- a/ghost/admin/app/components/modals/tiers/unarchive.js
+++ /dev/null
@@ -1,31 +0,0 @@
-import Component from '@glimmer/component';
-import {inject as service} from '@ember/service';
-import {task} from 'ember-concurrency';
-
-export default class UnarchiveTierModal extends Component {
-    @service notifications;
-    @service router;
-
-    get isActive() {
-        const {tier} = this.args.data;
-        return !!tier.active;
-    }
-
-    @task({drop: true})
-    *unarchiveTask() {
-        const {tier, onUnarchive} = this.args.data;
-        tier.active = true;
-
-        try {
-            yield tier.save();
-            onUnarchive?.();
-            return tier;
-        } catch (error) {
-            if (error) {
-                this.notifications.showAPIError(error, {key: 'tier.unarchive.failed'});
-            }
-        } finally {
-            this.args.close();
-        }
-    }
-}
diff --git a/ghost/admin/app/components/settings/analytics.hbs b/ghost/admin/app/components/settings/analytics.hbs
deleted file mode 100644
index 8fb4a1db771..00000000000
--- a/ghost/admin/app/components/settings/analytics.hbs
+++ /dev/null
@@ -1,117 +0,0 @@
-<div class="gh-main-section">
-    <h4 class="gh-main-section-header small bn">Newsletters</h4>
-    <section class="gh-expandable">
-        <div class="gh-expandable-block">
-            <div class="gh-expandable-header">
-                <div>
-                    <h4 class="gh-expandable-title">Newsletter opens</h4>
-                    <p class="gh-expandable-description">
-                        Record when a member opens an email
-                    </p>
-                </div>
-                <div class="for-switch">
-                    <label class="switch" for="email-track-opens" data-test-label="email-track-opens">
-                        <input
-                            id="email-track-opens"
-                            type="checkbox"
-                            checked={{this.settings.emailTrackOpens}}
-                            {{on "change" this.toggleEmailTrackOpens}}
-                            data-test-checkbox="email-track-opens"
-                        >
-                        <span class="input-toggle-component"></span>
-                    </label>
-                </div>
-            </div>
-        </div>
-
-        <div class="gh-expandable-block">
-            <div class="gh-expandable-header">
-                <div>
-                    <h4 class="gh-expandable-title">Newsletter clicks</h4>
-                    <p class="gh-expandable-description">
-                        Record when a member clicks on any link in an email
-                    </p>
-                </div>
-                <div class="for-switch">
-                    <label class="switch" for="email-track-clicks" data-test-label="email-track-clicks">
-                        <input
-                            id="email-track-clicks"
-                            type="checkbox"
-                            {{on "change" this.toggleEmailTrackClicks}}
-                            checked={{this.settings.emailTrackClicks}}
-                            data-test-checkbox="email-track-clicks"
-                        >
-                        <span class="input-toggle-component"></span>
-                    </label>
-                </div>
-            </div>
-        </div>
-    </section>
-</div>
-
-<div class="gh-main-section">
-    <h4 class="gh-main-section-header small bn">Sources</h4>
-    <section class="gh-expandable">
-        <div class="gh-expandable-block">
-            <div class="gh-expandable-header">
-                <div>
-                    <h4 class="gh-expandable-title">Member sources</h4>
-                    <p class="gh-expandable-description">
-                        Track the traffic sources and posts that drive the most member growth
-                    </p>
-                </div>
-                <div class="for-switch">
-                    <label class="switch" for="members-track-sources" data-test-label="members-track-sources">
-                        <input
-                            id="members-track-sources"
-                            type="checkbox"
-                            checked={{this.settings.membersTrackSources}}
-                            data-test-checkbox="members-track-sources"
-                            {{on "change" this.toggleMembersTrackSources}}
-                        >
-                        <span class="input-toggle-component"></span>
-                    </label>
-                </div>
-            </div>
-        </div>
-        <div class="gh-expandable-block">
-            <div class="gh-expandable-header">
-                <div>
-                    <h4 class="gh-expandable-title">Outbound link tagging</h4>
-                    <p class="gh-expandable-description">
-                        Make it easier for other sites to track the traffic you send them in their analytics
-                    </p>
-                </div>
-                <div class="for-switch">
-                    <label class="switch" for="outbound-link-tagging" data-test-label="outbound-link-tagging">
-                        <input
-                            id="outbound-link-tagging"
-                            type="checkbox"
-                            checked={{this.settings.outboundLinkTagging}}
-                            data-test-checkbox="outbound-link-tagging"
-                            {{on "change" this.toggleOutboundLinkTagging}}
-                        >
-                        <span class="input-toggle-component"></span>
-                    </label>
-                </div>
-            </div>
-        </div>
-    </section>
-</div>
-
-<div class="gh-main-section">
-    <h4 class="gh-main-section-header small bn">Posts</h4>
-    <section class="gh-expandable">
-        <div class="gh-expandable-block">
-            <div class="gh-expandable-header">
-                <div>
-                    <h4 class="gh-expandable-title">Export post analytics</h4>
-                    <p class="gh-expandable-description">
-                        Download a CSV file of your last 1000 posts data for easy analysis in one place
-                    </p>
-                </div>
-                <GhTaskButton @buttonText="Export" @successText="Exported" @task={{this.exportPostsTask}} @class="gh-btn gh-btn-icon"/>
-            </div>
-        </div>
-    </section>
-</div>
diff --git a/ghost/admin/app/components/settings/analytics.js b/ghost/admin/app/components/settings/analytics.js
deleted file mode 100644
index c6ee17e30ff..00000000000
--- a/ghost/admin/app/components/settings/analytics.js
+++ /dev/null
@@ -1,54 +0,0 @@
-import Component from '@glimmer/component';
-import ghostPaths from 'ghost-admin/utils/ghost-paths';
-import {action} from '@ember/object';
-import {inject as service} from '@ember/service';
-import {task} from 'ember-concurrency';
-
-export default class Analytics extends Component {
-    @service settings;
-    @service feature;
-    @service utils;
-
-    @action
-    toggleEmailTrackOpens(event) {
-        if (event) {
-            event.preventDefault();
-        }
-        this.settings.emailTrackOpens = !this.settings.emailTrackOpens;
-    }
-
-    @task
-    *exportPostsTask() {
-        let exportUrl = ghostPaths().url.api('posts/export');
-        let downloadParams = new URLSearchParams();
-        downloadParams.set('limit', 1000);
-
-        yield this.utils.fetchAndDownloadFile(`${exportUrl}?${downloadParams.toString()}`);
-
-        return true;
-    }
-
-    @action
-    toggleEmailTrackClicks(event) {
-        if (event) {
-            event.preventDefault();
-        }
-        this.settings.emailTrackClicks = !this.settings.emailTrackClicks;
-    }
-
-    @action
-    toggleMembersTrackSources(event) {
-        if (event) {
-            event.preventDefault();
-        }
-        this.settings.membersTrackSources = !this.settings.membersTrackSources;
-    }
-
-    @action
-    toggleOutboundLinkTagging(event) {
-        if (event) {
-            event.preventDefault();
-        }
-        this.settings.outboundLinkTagging = !this.settings.outboundLinkTagging;
-    }
-}
diff --git a/ghost/admin/app/components/settings/design/general-settings-form.hbs b/ghost/admin/app/components/settings/design/general-settings-form.hbs
deleted file mode 100644
index 12eb410e8f8..00000000000
--- a/ghost/admin/app/components/settings/design/general-settings-form.hbs
+++ /dev/null
@@ -1,7 +0,0 @@
-<div class="gh-stack" ...attributes>
-    <Settings::FormFields::SiteDescription class="gh-stack-item gh-setting-first" @didUpdate={{@didUpdate}} />
-    <Settings::FormFields::AccentColor class="gh-stack-item gh-setting" @didUpdate={{@didUpdate}} />
-    <Settings::FormFields::PublicationIcon class="gh-stack-item gh-setting" @didUpdate={{@didUpdate}} />
-    <Settings::FormFields::PublicationLogo class="gh-stack-item gh-setting" @didUpdate={{@didUpdate}} />
-    <Settings::FormFields::PublicationCover class="gh-stack-item gh-setting" @didUpdate={{@didUpdate}} />
-</div>
\ No newline at end of file
diff --git a/ghost/admin/app/components/settings/design/theme-settings-form.hbs b/ghost/admin/app/components/settings/design/theme-settings-form.hbs
deleted file mode 100644
index e872626ebb6..00000000000
--- a/ghost/admin/app/components/settings/design/theme-settings-form.hbs
+++ /dev/null
@@ -1,23 +0,0 @@
-<div class="gh-stack">
-    <form>
-        {{#each @themeSettings as |setting index|}}
-            {{#if setting.visible}}
-                {{#if (eq setting.type "select")}}
-                    <CustomThemeSettings::Select @setting={{setting}} @index={{index}} @onChange={{@onChange}} />
-                {{/if}}
-                {{#if (eq setting.type "boolean")}}
-                    <CustomThemeSettings::Boolean @setting={{setting}} @index={{index}} @onChange={{@onChange}} />
-                {{/if}}
-                {{#if (eq setting.type "color")}}
-                    <CustomThemeSettings::Color @setting={{setting}} @index={{index}} @onChange={{@onChange}} />
-                {{/if}}
-                {{#if (eq setting.type "text")}}
-                    <CustomThemeSettings::Text @setting={{setting}} @index={{index}} @onChange={{@onChange}} />
-                {{/if}}
-                {{#if (eq setting.type "image")}}
-                    <CustomThemeSettings::Image @setting={{setting}} @index={{index}} @onChange={{@onChange}} />
-                {{/if}}
-            {{/if}}
-        {{/each}}
-    </form>
-</div>
\ No newline at end of file
diff --git a/ghost/admin/app/components/settings/form-fields/accent-color.hbs b/ghost/admin/app/components/settings/form-fields/accent-color.hbs
deleted file mode 100644
index ce364920080..00000000000
--- a/ghost/admin/app/components/settings/form-fields/accent-color.hbs
+++ /dev/null
@@ -1,49 +0,0 @@
-<div class="gh-accent-color" ...attributes>
-    <div class="gh-setting-content">
-        <label class="gh-setting-title" for="accent-color">Accent color</label>
-        <div class="gh-setting-desc">Primary color used in your publication theme</div>
-        <div class="w-100 flex flex-column flex-row-ns">
-            <GhErrorMessage @errors={{this.settings.errors}} @property="accentColor" class="w-100 red" />
-        </div>
-    </div>
-
-    <div class="gh-setting-action" data-test-setting="accentColor">
-        <GhFormGroup
-            @errors={{this.settings.errors}}
-            @hasValidated={{this.settings.hasValidated}}
-            @property="accentColor"
-            @class="input-color-form-group"
-        >
-            <div class="input-color">
-                <input
-                    id="accent-color"
-                    type="text"
-                    placeholder="15171A"
-                    name="accent-color"
-                    autocorrect="off"
-                    maxlength="6"
-                    value={{this.accentColor}}
-                    class="gh-input"
-                    {{on "input" (perform this.debounceUpdateAccentColor)}}
-                    {{on "blur" this.updateAccentColor}}
-                    {{on-key "Enter" this.blurElement}}
-                    data-test-input="accentColor"
-                />
-                <div class="color-picker-horizontal-divider"></div>
-                <div
-                    class="color-box-container"
-                    style={{this.accentColorBgStlye}}
-                >
-                    <input
-                        type="color"
-                        name="accent-color"
-                        class="color-picker"
-                        value="{{this.accentColorPickerValue}}"
-                        {{on "input" (perform this.debounceUpdateAccentColor)}}
-                        aria-label="Accent color picker"
-                    >
-                </div>
-            </div>
-        </GhFormGroup>
-    </div>
-</div>
\ No newline at end of file
diff --git a/ghost/admin/app/components/settings/form-fields/accent-color.js b/ghost/admin/app/components/settings/form-fields/accent-color.js
deleted file mode 100644
index 5bd4a635f6e..00000000000
--- a/ghost/admin/app/components/settings/form-fields/accent-color.js
+++ /dev/null
@@ -1,84 +0,0 @@
-import Component from '@glimmer/component';
-import {action} from '@ember/object';
-import {htmlSafe} from '@ember/template';
-import {inject as service} from '@ember/service';
-import {task, timeout} from 'ember-concurrency';
-
-export default class AccentColorFormField extends Component {
-    @service settings;
-
-    get accentColor() {
-        const color = this.settings.accentColor;
-        if (color && color[0] === '#') {
-            return color.slice(1);
-        }
-        return color;
-    }
-
-    get accentColorPickerValue() {
-        return this.settings.accentColor || '#ffffff';
-    }
-
-    get accentColorBgStyle() {
-        return htmlSafe(`background-color: ${this.accentColorPickerValue}`);
-    }
-
-    willDestroy() {
-        super.willDestroy?.(...arguments);
-        this.settings.errors.remove('accentColor');
-    }
-
-    @action
-    async updateAccentColor(event) {
-        let newColor = event.target.value;
-        const oldColor = this.settings.accentColor;
-
-        // reset errors and validation
-        this.settings.errors.remove('accentColor');
-        this.settings.hasValidated.removeObject('accentColor');
-
-        if (newColor === '') {
-            if (newColor === oldColor) {
-                return;
-            }
-
-            // Don't allow empty accent color
-            this.settings.errors.add('accentColor', 'Please select an accent color');
-            this.settings.hasValidated.pushObject('accentColor');
-            return;
-        }
-
-        // accentColor will be null unless the user has input something
-        if (!newColor) {
-            newColor = oldColor;
-        }
-
-        if (newColor[0] !== '#') {
-            newColor = `#${newColor}`;
-        }
-
-        if (newColor.match(/#[0-9A-Fa-f]{6}$/)) {
-            if (newColor === oldColor) {
-                return;
-            }
-
-            this.settings.accentColor = newColor;
-            this.args.didUpdate('accentColor', newColor);
-        } else {
-            this.settings.errors.add('accentColor', 'Please enter a color in hex format');
-            this.settings.hasValidated.pushObject('accentColor');
-        }
-    }
-
-    @task({restartable: true})
-    *debounceUpdateAccentColor(event) {
-        yield timeout(500);
-        this.updateAccentColor(event);
-    }
-
-    @action
-    blurElement(event) {
-        event.preventDefault();
-        event.target.blur();
-    }
-}
diff --git a/ghost/admin/app/components/settings/form-fields/publication-cover.hbs b/ghost/admin/app/components/settings/form-fields/publication-cover.hbs
deleted file mode 100644
index a16d12a100a..00000000000
--- a/ghost/admin/app/components/settings/form-fields/publication-cover.hbs
+++ /dev/null
@@ -1,65 +0,0 @@
-<div data-test-setting="coverImage" ...attributes>
-    <GhUploader
-        @extensions={{this.imageExtensions}}
-        @onComplete={{this.imageUploaded}}
-        as |uploader|
-    >
-    <div>
-        <label class="gh-setting-title" for="publication-cover">Publication cover</label>
-        {{#each uploader.errors as |error|}}
-            <div class="gh-setting-error" data-test-error="coverImage">{{or error.context error.message}}</div>
-        {{/each}}
-
-        <div class="gh-setting-action gh-uploadbutton-container flex flex-column items-stretch">
-            {{#if uploader.isUploading}}
-                {{uploader.progressBar}}
-            {{else if this.settings.coverImage}}
-                <div class="gh-branding-image-container largeimg justify-start">
-                    <input
-                        id="publication-cover"
-                        type="image"
-                        class="blog-cover"
-                        src="{{this.settings.coverImage}}"
-                        {{on "click" uploader.triggerFileDialog}}
-                        data-test-cover-img
-                    >
-                    <KoenigImageEditor
-                        @className="gh-setting-action-largeimg-delete gh-setting-action-largeimg-edit"
-                        @imageSrc={{this.settings.coverImage}}
-                        @saveImage={{fn this.saveImage uploader.setFiles}}
-                    />
-                    <button type="button" class="gh-setting-action-largeimg-delete" {{on "click" (fn this.update null)}} data-test-delete-image="coverImage">
-                        {{svg-jar "trash" class="w4 h4"}}
-                    </button>
-                </div>
-            {{else}}
-                <div class="self-start">
-                    <button id="publication-cover" type="button" class="gh-btn gh-btn-white" {{on "click" uploader.triggerFileDialog}} data-test-image-upload-btn="coverImage">
-                        <span>Upload cover</span>
-                    </button>
-                    <button type="button" class="gh-btn gh-btn-white w10" {{on "click" this.toggleUnsplashSelector}} aria-label="Select photo from Unsplash">
-                        <span>{{svg-jar "unsplash" class="nudge-right--2 nudge-bottom--2"}}</span>
-                    </button>
-                </div>
-            {{/if}}
-            <div class="dn">
-                <GhFileInput
-                    @multiple={{false}}
-                    @action={{uploader.setFiles}}
-                    @accept={{this.imageMimeTypes}}
-                    @onInsert={{uploader.registerFileInput}}
-                    data-test-file-input="coverImage"
-                />
-            </div>
-        </div>
-        <div class="gh-setting-desc mb3">An optional large background image for your site</div>
-    </div>
-    </GhUploader>
-
-    {{#if this.showUnsplashSelector}}
-        <GhUnsplash
-            @select={{this.setUnsplashImage}}
-            @close={{this.toggleUnsplashSelector}}
-        />
-    {{/if}}
-</div>
\ No newline at end of file
diff --git a/ghost/admin/app/components/settings/form-fields/publication-cover.js b/ghost/admin/app/components/settings/form-fields/publication-cover.js
deleted file mode 100644
index 91a03984659..00000000000
--- a/ghost/admin/app/components/settings/form-fields/publication-cover.js
+++ /dev/null
@@ -1,46 +0,0 @@
-import Component from '@glimmer/component';
-import {
-    IMAGE_EXTENSIONS,
-    IMAGE_MIME_TYPES
-} from 'ghost-admin/components/gh-image-uploader';
-import {action} from '@ember/object';
-import {inject as service} from '@ember/service';
-import {tracked} from '@glimmer/tracking';
-
-export default class PublicationCoverFormField extends Component {
-    @service feature;
-    @service settings;
-
-    @tracked showUnsplashSelector = false;
-
-    imageExtensions = IMAGE_EXTENSIONS;
-    imageMimeTypes = IMAGE_MIME_TYPES;
-
-    @action
-    imageUploaded(results) {
-        if (results[0]) {
-            this.update(results[0].url);
-        }
-    }
-
-    @action
-    update(value) {
-        this.settings.coverImage = value;
-        this.args.didUpdate('coverImage', value);
-    }
-
-    @action
-    toggleUnsplashSelector() {
-        this.showUnsplashSelector = !this.showUnsplashSelector;
-    }
-
-    @action
-    saveImage(setFiles, imageFile) {
-        setFiles([imageFile]);
-    }
-
-    @action
-    setUnsplashImage({src}) {
-        this.update(src);
-    }
-}
diff --git a/ghost/admin/app/components/settings/form-fields/publication-icon.hbs b/ghost/admin/app/components/settings/form-fields/publication-icon.hbs
deleted file mode 100644
index eb8885d4e11..00000000000
--- a/ghost/admin/app/components/settings/form-fields/publication-icon.hbs
+++ /dev/null
@@ -1,48 +0,0 @@
-<div data-test-setting="icon" ...attributes>
-    <GhUploader
-        @extensions={{this.iconExtensions}}
-        @paramsHash={{hash purpose="icon"}}
-        @onComplete={{this.imageUploaded}}
-        as |uploader|
-    >
-    <div class="gh-setting-content">
-        <label class="gh-setting-title" for="publication-icon">Publication icon</label>
-        <div class="gh-setting-desc">A square, social icon, at least 60x60px</div>
-        {{#each uploader.errors as |error|}}
-            <div class="gh-setting-error" data-test-error="icon">{{or error.context error.message}}</div>
-        {{/each}}
-    </div>
-    <div class="gh-setting-action gh-uploadbutton-container gh-setting-action-smallimg flex flex-column">
-        {{#if uploader.isUploading}}
-            {{uploader.progressBar}}
-        {{else if this.settings.icon}}
-            <div class="gh-branding-image-container transparent-bg">
-                <input
-                    id="publication-icon"
-                    type="image"
-                    class="blog-icon"
-                    src={{this.settings.icon}}
-                    {{on "click" uploader.triggerFileDialog}}
-                    data-test-icon-img
-                >
-                <button type="button" class="gh-setting-action-smallimg-delete" {{on "click" (fn this.update null)}} data-test-delete-image="icon">
-                    {{svg-jar "trash" class="w4 h4"}}
-                </button>
-            </div>
-        {{else}}
-            <button id="publication-icon" type="button" class="gh-btn gh-btn-white self-center" {{on "click" uploader.triggerFileDialog}} data-test-image-upload-btn="icon">
-                <span>Upload icon</span>
-            </button>
-        {{/if}}
-        <div class="dn">
-            <GhFileInput
-                @multiple={{false}}
-                @action={{uploader.setFiles}}
-                @accept={{this.iconMimeTypes}}
-                @onInsert={{uploader.registerFileInput}}
-                data-test-file-input="icon"
-            />
-        </div>
-    </div>
-    </GhUploader>
-</div>
\ No newline at end of file
diff --git a/ghost/admin/app/components/settings/form-fields/publication-icon.js b/ghost/admin/app/components/settings/form-fields/publication-icon.js
deleted file mode 100644
index e45aaf783b6..00000000000
--- a/ghost/admin/app/components/settings/form-fields/publication-icon.js
+++ /dev/null
@@ -1,27 +0,0 @@
-import Component from '@glimmer/component';
-import {
-    ICON_EXTENSIONS,
-    ICON_MIME_TYPES
-} from 'ghost-admin/components/gh-image-uploader';
-import {action} from '@ember/object';
-import {inject as service} from '@ember/service';
-
-export default class PublicationIconFormField extends Component {
-    @service settings;
-
-    iconExtensions = ICON_EXTENSIONS;
-    iconMimeTypes = ICON_MIME_TYPES;
-
-    @action
-    imageUploaded(results) {
-        if (results[0]) {
-            this.update(results[0].url);
-        }
-    }
-
-    @action
-    update(value) {
-        this.settings.icon = value;
-        this.args.didUpdate('icon', value);
-    }
-}
diff --git a/ghost/admin/app/components/settings/form-fields/publication-logo.hbs b/ghost/admin/app/components/settings/form-fields/publication-logo.hbs
deleted file mode 100644
index 1d58887eded..00000000000
--- a/ghost/admin/app/components/settings/form-fields/publication-logo.hbs
+++ /dev/null
@@ -1,52 +0,0 @@
-<div data-test-setting="logo" ...attributes>
-    <GhUploader
-        @extensions={{this.imageExtensions}}
-        @onComplete={{this.imageUploaded}}
-        as |uploader|
-    >
-        <div>
-            <label class="gh-setting-title" for="publication-logo">Publication logo</label>
-            <div class="gh-setting-desc mb3">The primary logo, should be transparent and at least 600x72px</div>
-
-            <div class="gh-setting-action gh-uploadbutton-container gh-setting-action-smallimg flex flex-column" style="margin-top: 12px;">
-                {{#each uploader.errors as |error|}}
-                    <div class="gh-setting-error" data-test-error="logo">{{or error.context error.message}}</div>
-                {{/each}}
-                {{#if uploader.isUploading}}
-                    {{uploader.progressBar}}
-                {{else if this.settings.logo}}
-                    <div class="gh-branding-image-container largeimg justify-center transparent-bg">
-                        <input
-                            id="publication-logo"
-                            type="image"
-                            class="blog-logo"
-                            src={{this.settings.logo}}
-                            {{on "click" uploader.triggerFileDialog}}
-                            data-test-logo-img
-                        >
-                        <KoenigImageEditor
-                            @className="gh-setting-action-smallimg-delete gh-setting-action-smallimg-edit"
-                            @imageSrc={{this.settings.logo}}
-                            @saveImage={{fn this.saveImage uploader.setFiles}}
-                        />
-                        <button type="button" class="gh-setting-action-smallimg-delete" {{on "click" (fn this.update null)}} data-test-delete-image="logo">
-                            {{svg-jar "trash" class="w4 h4"}}
-                        </button>
-                    </div>
-                {{else}}
-                    <button id="publication-logo" type="button" class="gh-btn gh-btn-white self-start" {{on "click" uploader.triggerFileDialog}} data-test-image-upload-btn="logo">
-                        <span>Upload logo</span>
-                    </button>
-                {{/if}}
-                <div class="dn">
-                    <GhFileInput
-                        @multiple={{false}}
-                        @action={{uploader.setFiles}}
-                        @accept={{this.imageMimeTypes}}
-                        @onInsert={{uploader.registerFileInput}}
-                        data-test-file-input="logo" />
-                </div>
-            </div>
-        </div>
-    </GhUploader>
-</div>
\ No newline at end of file
diff --git a/ghost/admin/app/components/settings/form-fields/publication-logo.js b/ghost/admin/app/components/settings/form-fields/publication-logo.js
deleted file mode 100644
index bb836b91ce2..00000000000
--- a/ghost/admin/app/components/settings/form-fields/publication-logo.js
+++ /dev/null
@@ -1,32 +0,0 @@
-import Component from '@glimmer/component';
-import {
-    IMAGE_EXTENSIONS,
-    IMAGE_MIME_TYPES
-} from 'ghost-admin/components/gh-image-uploader';
-import {action} from '@ember/object';
-import {inject as service} from '@ember/service';
-
-export default class PublicationLogoFormField extends Component {
-    @service settings;
-
-    imageExtensions = IMAGE_EXTENSIONS;
-    imageMimeTypes = IMAGE_MIME_TYPES;
-
-    @action
-    imageUploaded(results) {
-        if (results[0]) {
-            this.update(results[0].url);
-        }
-    }
-
-    @action
-    saveImage(setFiles, imageFile) {
-        setFiles([imageFile]);
-    }
-
-    @action
-    update(value) {
-        this.settings.logo = value;
-        this.args.didUpdate('logo', value);
-    }
-}
diff --git a/ghost/admin/app/components/settings/form-fields/site-description.hbs b/ghost/admin/app/components/settings/form-fields/site-description.hbs
deleted file mode 100644
index 2aa11f639c1..00000000000
--- a/ghost/admin/app/components/settings/form-fields/site-description.hbs
+++ /dev/null
@@ -1,20 +0,0 @@
-<div ...attributes>
-    <div class="flex-grow-1">
-        <label class="gh-setting-title" for="site-description">Site description</label>
-        <div class="gh-setting-action" data-test-setting="description">
-            <GhFormGroup @errors={{this.settings.errors}} @hasValidated={{this.settings.hasValidated}} @property="description" class="description-container">
-                <input
-                    id="site-description"
-                    type="text"
-                    class="gh-input"
-                    value={{this.settings.description}}
-                    {{on "input" this.update}}
-                    {{on "blur" this.validate}}
-                    data-test-input="siteDescription"
-                >
-                <GhErrorMessage @errors={{this.settings.errors}} @property="description"/>
-            </GhFormGroup>
-        </div>
-        <div class="gh-setting-desc mb3">Used in your theme, meta data and search results</div>
-    </div>
-</div>
\ No newline at end of file
diff --git a/ghost/admin/app/components/settings/form-fields/site-description.js b/ghost/admin/app/components/settings/form-fields/site-description.js
deleted file mode 100644
index a73b904c0a2..00000000000
--- a/ghost/admin/app/components/settings/form-fields/site-description.js
+++ /dev/null
@@ -1,20 +0,0 @@
-import Component from '@glimmer/component';
-import {action} from '@ember/object';
-import {inject as service} from '@ember/service';
-
-export default class SiteDescriptionFormField extends Component {
-    @service settings;
-
-    @action
-    update(event) {
-        this.settings.description = event.target.value;
-    }
-
-    @action
-    async validate(event) {
-        const value = event.target.value;
-        this.settings.description = value;
-        await this.settings.validate({property: 'description'});
-        this.args.didUpdate('description', value);
-    }
-}
diff --git a/ghost/admin/app/components/settings/history/event-filter.hbs b/ghost/admin/app/components/settings/history/event-filter.hbs
deleted file mode 100644
index eda7f4bca87..00000000000
--- a/ghost/admin/app/components/settings/history/event-filter.hbs
+++ /dev/null
@@ -1,64 +0,0 @@
-<GhBasicDropdown @verticalPosition="below" as |dd|>
-    <dd.Trigger class="gh-btn gh-btn-icon gh-btn-action-icon">
-        <span class={{if (or @excludedEvents @excludedResources) "gh-btn-label-green"}}>
-            {{svg-jar "filter"}}
-            Filter events
-        </span>
-    </dd.Trigger>
-
-    <dd.Content class="gh-activity-log-actions dropdown-menu dropdown-triangle-top-right">
-        {{!-- NOTE: re-using ember-power-select-options styles --}}
-        <ul class="ember-power-select-options" role="listbox">
-            {{#each this.eventTypes as |type idx|}}
-                <li class="form-group ember-power-select-option gh-history-filter-li">
-                    <div class="gh-activity-log-action-switch for-switch small">
-                        <label
-                            class="switch"
-                            for="event-type-{{idx}}"
-                        >
-                            <div class="flex items-center">
-                                {{svg-jar type.icon}}
-                                <span>{{type.name}}</span>
-                            </div>
-                            <input
-                                type="checkbox"
-                                checked={{type.isSelected}}
-                                id="event-type-{{idx}}"
-                                name="eventTypes"
-                                {{on "input" (fn this.toggleEventType type.event)}}
-                            >
-                            <span class="input-toggle-component"></span>
-                        </label>
-                    </div>
-                </li>
-            {{/each}}
-            <hr />
-            {{#each this.resourceTypes as |type idx|}}
-                <li class="form-group ember-power-select-option gh-history-filter-li">
-                    {{!-- <div class="flex items-center">
-                        {{svg-jar "pen"}}
-                    </div> --}}
-                    <div class="gh-activity-log-action-switch for-switch small">
-                        <label
-                            class="switch"
-                            for="resource-type-{{idx}}"
-                        >
-                            <div class="flex items-center">
-                                {{svg-jar type.icon}}
-                                <span>{{type.name}}</span>
-                            </div>
-                            <input
-                                type="checkbox"
-                                checked={{type.isSelected}}
-                                id="resource-type-{{idx}}"
-                                name="eventTypes"
-                                {{on "input" (fn this.toggleResourceType type.targets)}}
-                            >
-                            <span class="input-toggle-component"></span>
-                        </label>
-                    </div>
-                </li>
-            {{/each}}
-        </ul>
-    </dd.Content>
-</GhBasicDropdown>
\ No newline at end of file
diff --git a/ghost/admin/app/components/settings/history/event-filter.js b/ghost/admin/app/components/settings/history/event-filter.js
deleted file mode 100644
index 82285110c7c..00000000000
--- a/ghost/admin/app/components/settings/history/event-filter.js
+++ /dev/null
@@ -1,80 +0,0 @@
-import Component from '@glimmer/component';
-import {action} from '@ember/object';
-
-const ALL_EVENT_TYPES = [
-    {event: 'added', name: 'Added', icon: 'plus-large'},
-    {event: 'edited', name: 'Edited', icon: 'pen'},
-    {event: 'deleted', name: 'Deleted', icon: 'trash'}
-];
-
-const ALL_RESOURCE_TYPES = [
-    {targets: 'post', name: 'Posts', icon: 'posts'},
-    {targets: 'page', name: 'Pages', icon: 'page'},
-    {targets: 'tag', name: 'Tags', icon: 'tag'},
-    {targets: 'offer,product', name: 'Tiers & offers', icon: 'percentage'},
-    {targets: 'api_key,integration,setting,user,webhook', name: 'Settings & staff', icon: 'settings'}
-];
-
-export default class HistoryEventFilter extends Component {
-    excludedEvents = null;
-    excludedResources = null;
-
-    get eventTypes() {
-        const excludedEvents = (this.args.excludedEvents || '').split(',');
-
-        return ALL_EVENT_TYPES.map(type => ({
-            event: type.event,
-            name: type.name,
-            icon: type.icon,
-            isSelected: !excludedEvents.includes(type.event)
-        }));
-    }
-
-    get resourceTypes() {
-        const excludedResources = (this.args.excludedResources || '').split(',');
-
-        return ALL_RESOURCE_TYPES.map(type => ({
-            targets: type.targets,
-            name: type.name,
-            icon: type.icon,
-            isSelected: !type.targets.split(',').every(t => excludedResources.includes(t))
-        }));
-    }
-
-    @action
-    toggleEventType(eventType) {
-        const excludedEvents = new Set(this.eventTypes.reject(type => type.isSelected).map(type => type.event));
-
-        if (excludedEvents.has(eventType)) {
-            excludedEvents.delete(eventType);
-        } else {
-            excludedEvents.add(eventType);
-        }
-
-        this.excludedEvents = Array.from(excludedEvents).join(',');
-        this.args.onChange({
-            excludedEvents: this.excludedEvents,
-            excludedResources: this.excludedResources
-        });
-    }
-
-    @action
-    toggleResourceType(resourceType) {
-        const resourceTypeElements = resourceType.split(',');
-        const excludedResources = new Set(this.resourceTypes.reject(type => type.isSelected).flatMap(type => type.targets.split(',')));
-
-        for (const resource of resourceTypeElements) {
-            if (excludedResources.has(resource)) {
-                excludedResources.delete(resource);
-            } else {
-                excludedResources.add(resource);
-            }
-        }
-
-        this.excludedResources = Array.from(excludedResources).join(',');
-        this.args.onChange({
-            excludedEvents: this.excludedEvents,
-            excludedResources: this.excludedResources
-        });
-    }
-}
diff --git a/ghost/admin/app/components/settings/history/no-events.hbs b/ghost/admin/app/components/settings/history/no-events.hbs
deleted file mode 100644
index 71a0186b7b1..00000000000
--- a/ghost/admin/app/components/settings/history/no-events.hbs
+++ /dev/null
@@ -1,13 +0,0 @@
-<div class="no-posts-box">
-    <div class="no-posts">
-        {{svg-jar "activity-placeholder" class="gh-members-placeholder"}}
-        {{#if @filter}}
-            <h4>No events match the current filter</h4>
-            <LinkTo @route="settings.history" @query={{reset-query-params "settings.history"}} class="gh-btn gh-btn-lg">
-                <span>Show all events</span>
-            </LinkTo>
-        {{else}}
-            <h4>No events yet</h4>
-        {{/if}}
-    </div>
-</div>
\ No newline at end of file
diff --git a/ghost/admin/app/components/settings/history/search-trigger.hbs b/ghost/admin/app/components/settings/history/search-trigger.hbs
deleted file mode 100644
index 3a6191dccc5..00000000000
--- a/ghost/admin/app/components/settings/history/search-trigger.hbs
+++ /dev/null
@@ -1 +0,0 @@
-<div class="gh-btn"><span>Filter user {{svg-jar "arrow-down-small"}}</span></div>
diff --git a/ghost/admin/app/components/settings/history/search.hbs b/ghost/admin/app/components/settings/history/search.hbs
deleted file mode 100644
index f6656a87661..00000000000
--- a/ghost/admin/app/components/settings/history/search.hbs
+++ /dev/null
@@ -1,23 +0,0 @@
-{{#if @selected}}
-    <button class="gh-btn" {{on "click" (fn @onChange null)}} type="button">
-        <span class="gh-btn-label-green">
-            Clear search &times;
-        </span>
-    </button>
-{{else}}
-    <PowerSelect
-        @searchEnabled={{false}}
-        @search={{perform this.searchUsersTask}}
-        @selected={{@selected}}
-        @onChange={{@onChange}}
-        @triggerClass="gh-member-filter-search-trigger"
-        @dropdownClass="gh-member-filter-search-dropdown"
-        @triggerComponent={{component "gh-input-with-select/trigger"}}
-        @placeholder="Search staff"
-        @extra={{hash showSearchMessage=false}}
-        as |member|
-    >
-        {{#if member.name}}<strong>{{member.name}}</strong>{{/if}}
-        <span>{{member.email}}</span>
-    </PowerSelect>
-{{/if}}
diff --git a/ghost/admin/app/components/settings/history/search.js b/ghost/admin/app/components/settings/history/search.js
deleted file mode 100644
index 0fe03090546..00000000000
--- a/ghost/admin/app/components/settings/history/search.js
+++ /dev/null
@@ -1,20 +0,0 @@
-import Component from '@glimmer/component';
-import {action} from '@ember/object';
-import {inject as service} from '@ember/service';
-import {task, timeout} from 'ember-concurrency';
-
-export default class HistorySearch extends Component {
-    @service store;
-
-    @action
-    clear() {
-        this.args.onChange(null);
-    }
-
-    @task
-    *searchUsersTask(term) {
-        yield timeout(300); // debounce
-
-        return yield this.store.query('user', {search: term, limit: 20});
-    }
-}
diff --git a/ghost/admin/app/components/settings/history/table.hbs b/ghost/admin/app/components/settings/history/table.hbs
deleted file mode 100644
index 011da0dd432..00000000000
--- a/ghost/admin/app/components/settings/history/table.hbs
+++ /dev/null
@@ -1,74 +0,0 @@
-<table class="gh-list gh-history-table">
-    <thead>
-        <tr>
-            <th>&nbsp;</th>
-        </tr>
-    </thead>
-    <tbody>
-        {{#each @events as |event|}}
-        {{#let (parse-history-event event) as |ev|}}
-        {{#unless ev.original.skip}}
-        <tr>
-            <div class="gh-list-data">
-                <div class="gh-history-object flex items-center ma3">
-                    <span class="user-list-item-figure" style={{background-image-style ev.actorIcon}}>
-                        {{#if ev.actor.name}}
-                            <span class="hidden">Photo of {{ev.actor.name}}</span>
-                        {{/if}}
-                        <div class="gh-history-icon">{{svg-jar ev.actionIcon}}</div>
-                    </span>
-                    {{!--  --}}
-                    <div>
-                        <div class="gh-history-description">
-                            <span>
-                                {{capitalize-first-letter ev.action}}{{#unless ev.isBulkAction}}:{{/unless}}
-                            </span>
-                            {{#unless ev.isBulkAction}}
-                                {{#if ev.contextResource}}
-                                    <span>
-                                        <span>{{capitalize-first-letter ev.contextResource.first}}</span>
-                                        {{#if (not-eq ev.contextResource.first ev.contextResource.second)}}
-                                            <code>({{ev.contextResource.second}})</code>
-                                        {{/if}}
-                                    </span>
-                                {{else if (or ev.original.resource.title ev.original.resource.name ev.original.context.primary_name)}}
-                                    {{#if ev.linkTarget}}
-                                        {{#if ev.linkTarget.models}}
-                                            <LinkTo @route={{ev.linkTarget.route}} @models={{ev.linkTarget.models}} class="permalink fw6">
-                                                {{or ev.original.resource.title ev.original.resource.name}}
-                                            </LinkTo>
-                                        {{else}}
-                                            <LinkTo @route={{ev.linkTarget.route}} class="permalink fw6">
-                                                {{or ev.original.resource.title ev.original.resource.name}}
-                                            </LinkTo>
-                                        {{/if}}
-                                    {{else}}
-                                        <span>{{or ev.original.resource.title ev.original.resource.name ev.original.context.primary_name}}</span>
-                                    {{/if}}
-                                {{else}}
-                                    <span class="midlightgrey">(unknown)</span>
-                                {{/if}}
-                                {{#if ev.original.count}}{{ev.original.count}} times{{/if}}
-                            {{/unless}}
-
-                            <span class="gh-history-name">
-                                <span class="midgrey">&ndash; by </span>
-                                {{#if ev.actorLinkTarget}}
-                                    <LinkTo @route={{ev.actorLinkTarget.route}} @models={{ev.actorLinkTarget.models}}>
-                                        {{ev.actor.name}}
-                                    </LinkTo>
-                                {{else}}
-                                    (deleted user)
-                                {{/if}}
-                            </span>
-                        </div>
-                        <div class="gh-history-datetime">{{moment-format ev.original.created_at "DD MMM YYYY | HH:mm:ss"}}</div>
-                    </div>
-                </div>
-            </div>
-        </tr>
-        {{/unless}}
-        {{/let}}
-        {{/each}}
-    </tbody>
-</table>
diff --git a/ghost/admin/app/components/settings/integrations/delete-integration-modal.hbs b/ghost/admin/app/components/settings/integrations/delete-integration-modal.hbs
deleted file mode 100644
index a7a72e93d0a..00000000000
--- a/ghost/admin/app/components/settings/integrations/delete-integration-modal.hbs
+++ /dev/null
@@ -1,20 +0,0 @@
-<div class="modal-content" data-test-modal="delete-integration">
-    <header class="modal-header">
-        <h1>Are you sure?</h1>
-    </header>
-    <button type="button" class="close" title="Close" {{on "click" @close}}>{{svg-jar "close"}}<span class="hidden">Close</span></button>
-    <div class="modal-body">
-        <p>
-            Deleting this integration will remove all webhooks and api keys associated with it.
-        </p>
-    </div>
-    <div class="modal-footer">
-        <button class="gh-btn" type="button" {{on "click" @close}}><span>Cancel</span></button>
-        <GhTaskButton
-            @buttonText="Delete Integration"
-            @successText="Deleted"
-            @task={{this.deleteIntegrationTask}}
-            @class="gh-btn gh-btn-red gh-btn-icon"
-            data-test-button="confirm" />
-    </div>
-</div>
\ No newline at end of file
diff --git a/ghost/admin/app/components/settings/integrations/delete-integration-modal.js b/ghost/admin/app/components/settings/integrations/delete-integration-modal.js
deleted file mode 100644
index c9ae9ab505a..00000000000
--- a/ghost/admin/app/components/settings/integrations/delete-integration-modal.js
+++ /dev/null
@@ -1,29 +0,0 @@
-import Component from '@glimmer/component';
-import {inject as service} from '@ember/service';
-import {task} from 'ember-concurrency';
-
-export default class DeleteIntegrationModal extends Component {
-    @service notifications;
-    @service router;
-
-    @task({drop: true})
-    *deleteIntegrationTask() {
-        try {
-            const {integration} = this.args.data;
-
-            if (integration.isDeleted) {
-                return true;
-            }
-
-            yield integration.destroyRecord();
-
-            this.notifications.closeAlerts('integration.delete');
-            this.router.transitionTo('settings.integrations');
-            return true;
-        } catch (error) {
-            this.notifications.showAPIError(error, {key: 'integration.delete.failed'});
-        } finally {
-            this.args.close();
-        }
-    }
-}
diff --git a/ghost/admin/app/components/settings/integrations/delete-webhook-modal.hbs b/ghost/admin/app/components/settings/integrations/delete-webhook-modal.hbs
deleted file mode 100644
index b265a829dd0..00000000000
--- a/ghost/admin/app/components/settings/integrations/delete-webhook-modal.hbs
+++ /dev/null
@@ -1,17 +0,0 @@
-<div class="modal-content" data-test-modal="delete-webhook">
-    <header class="modal-header">
-        <h1>Are you sure?</h1>
-    </header>
-    <button type="button" class="close" title="Close" {{on "click" @close}}>{{svg-jar "close"}}<span class="hidden">Close</span></button>
-
-    <div class="modal-body">
-        <p>
-            Deleting this webhook may prevent the integration from functioning.
-        </p>
-    </div>
-
-    <div class="modal-footer">
-        <button class="gh-btn" type="button" {{on "click" @close}}><span>Cancel</span></button>
-        <GhTaskButton @buttonText="Delete Webhook" @successText="Deleted" @task={{this.deleteWebhookTask}} @class="gh-btn gh-btn-red gh-btn-icon" />
-    </div>
-</div>
\ No newline at end of file
diff --git a/ghost/admin/app/components/settings/integrations/delete-webhook-modal.js b/ghost/admin/app/components/settings/integrations/delete-webhook-modal.js
deleted file mode 100644
index 5c0563ccd65..00000000000
--- a/ghost/admin/app/components/settings/integrations/delete-webhook-modal.js
+++ /dev/null
@@ -1,28 +0,0 @@
-import Component from '@glimmer/component';
-import {inject as service} from '@ember/service';
-import {task} from 'ember-concurrency';
-
-export default class DeleteWebhookModal extends Component {
-    @service notifications;
-    @service router;
-
-    @task({drop: true})
-    *deleteWebhookTask() {
-        try {
-            const {webhook} = this.args.data;
-
-            if (webhook.isDeleted) {
-                return true;
-            }
-
-            yield webhook.destroyRecord();
-
-            this.notifications.closeAlerts('webhook.delete');
-            return true;
-        } catch (error) {
-            this.notifications.showAPIError(error, {key: 'webhook.delete.failed'});
-        } finally {
-            this.args.close();
-        }
-    }
-}
diff --git a/ghost/admin/app/components/settings/integrations/regenerate-key-modal.hbs b/ghost/admin/app/components/settings/integrations/regenerate-key-modal.hbs
deleted file mode 100644
index 7049c53e106..00000000000
--- a/ghost/admin/app/components/settings/integrations/regenerate-key-modal.hbs
+++ /dev/null
@@ -1,29 +0,0 @@
-<div class="modal-content" data-test-modal="regenerate-key">
-    <header class="modal-header">
-        <h1>Regenerate {{capitalize @data.apiKey.type}} API Key</h1>
-    </header>
-    <button type="button" class="close" title="Close" {{on "click" (fn @close null)}}>{{svg-jar "close"}}<span class="hidden">Close</span></button>
-
-    <div class="modal-body">
-        <p>
-            {{#if (eq @data.internalIntegration "zapier")}}
-                You will need to locate the Ghost App within your Zapier account and click on "Reconnect" to enter the new Admin API Key.
-            {{else}}
-                You can regenerate <strong>{{capitalize @data.apiKey.type}} API Key</strong> any time, but any scripts or applications using it will need to be updated.
-            {{/if}}
-        </p>
-        {{#if this.errorMessage}}
-            <p class='red'> {{this.errorMessage}}</p>
-        {{/if}}
-    </div>
-
-    <div class="modal-footer">
-        <button class="gh-btn" type="button" {{on "click" (fn @close null)}}><span>Cancel</span></button>
-        <GhTaskButton
-            @buttonText="Regenerate {{capitalize @data.apiKey.type}} API Key"
-            @successText="Regenerated"
-            @task={{this.regenerateKeyTask}}
-            @class="gh-btn gh-btn-icon gh-btn-red"
-        />
-    </div>
-</div>
\ No newline at end of file
diff --git a/ghost/admin/app/components/settings/integrations/regenerate-key-modal.js b/ghost/admin/app/components/settings/integrations/regenerate-key-modal.js
deleted file mode 100644
index 5bb431426f0..00000000000
--- a/ghost/admin/app/components/settings/integrations/regenerate-key-modal.js
+++ /dev/null
@@ -1,35 +0,0 @@
-import Component from '@glimmer/component';
-import {capitalize} from '@ember/string';
-import {inject as service} from '@ember/service';
-import {task} from 'ember-concurrency';
-import {tracked} from '@glimmer/tracking';
-
-export default class RegenerateKeyModal extends Component {
-    @service ajax;
-    @service ghostPaths;
-    @service notifications;
-    @service store;
-
-    @tracked errorMessage;
-
-    @task({drop: true})
-    *regenerateKeyTask() {
-        const {integration, apiKey} = this.args.data;
-        const url = this.ghostPaths.url.api('/integrations/', integration.id, 'api_key', apiKey.id, 'refresh');
-
-        try {
-            const response = yield this.ajax.post(url, {
-                data: {
-                    integrations: [{id: integration.id}]
-                }
-            });
-
-            this.store.pushPayload(response);
-            this.args.close(apiKey);
-        } catch (e) {
-            console.error(e); // eslint-disable-line
-            this.errorMessage = `There was an error regenerating the ${capitalize(apiKey.type)} API Key. Please try again`;
-            return;
-        }
-    }
-}
diff --git a/ghost/admin/app/components/settings/integrations/webhook-form-modal.hbs b/ghost/admin/app/components/settings/integrations/webhook-form-modal.hbs
deleted file mode 100644
index e526acf3be5..00000000000
--- a/ghost/admin/app/components/settings/integrations/webhook-form-modal.hbs
+++ /dev/null
@@ -1,109 +0,0 @@
-<div class="modal-content" data-test-modal="webhook-form">
-    <header class="modal-header" data-test-modal="webhook-form">
-        <h1 data-test-text="title">{{if @data.webhook.isNew "New" "Edit"}} webhook</h1>
-    </header>
-    <button class="close" href title="Close" type="button" {{on "click" @close}} {{on "mousedown" this.noop}}>
-        {{svg-jar "close"}}
-    </button>
-
-    <div class="modal-body">
-        <fieldset>
-            <GhFormGroup @errors={{@data.webhook.errors}} @hasValidated={{@data.webhook.hasValidated}} @property="name">
-                <label for="webhook-name" class="fw6">Name</label>
-                <input
-                    type="text"
-                    value={{@data.webhook.name}}
-                    id="webhook-name"
-                    class="gh-input mt1"
-                    autocapitalize="off"
-                    autocorrect="off"
-                    {{autofocus}}
-                    {{on "input" (fn this.setProperty "name")}}
-                    {{on "blur" (fn this.validate "name")}}
-                    data-test-input="webhook-name"
-                />
-                <GhErrorMessage @errors={{@data.webhook.errors}} @property="name" data-test-error="webhook-name" />
-            </GhFormGroup>
-        </fieldset>
-        <fieldset>
-            <GhFormGroup @errors={{@data.webhook.errors}} @hasValidated={{@data.webhook.hasValidated}} @property="event">
-                <label for="webhook-event" class="fw6">Event</label>
-                <span class="gh-select">
-                    <OneWaySelect
-                        @value={{@data.webhook.event}}
-                        @options={{this.availableEvents}}
-                        @optionValuePath="event"
-                        @optionLabelPath="name"
-                        @optionTargetPath="event"
-                        @groupLabelPath="group"
-                        @class="mt1"
-                        @includeBlank={{true}}
-                        @prompt="Select an event"
-                        @update={{this.selectEvent}}
-                        @id="webhook-event"
-                        @name="event"
-                        data-test-select="webhook-event" />
-                    {{svg-jar "arrow-down-small"}}
-                </span>
-                <GhErrorMessage @errors={{@data.webhook.errors}} @property="event" data-test-error="webhook-event" />
-            </GhFormGroup>
-        </fieldset>
-        <fieldset>
-            <GhFormGroup @errors={{@data.webhook.errors}} @hasValidated={{@data.webhook.hasValidated}} @property="targetUrl">
-                <label for="webhook-targetUrl" class="fw6">Target URL</label>
-                <input
-                    type="text"
-                    value={{@data.webhook.targetUrl}}
-                    id="webhook-targetUrl"
-                    class="gh-input mt1"
-                    placeholder="https://example.com"
-                    autocapitalize="off"
-                    autocorrect="off"
-                    {{on "input" (fn this.setProperty "targetUrl")}}
-                    {{on "blur" (fn this.validate "targetUrl")}}
-                    data-test-input="webhook-targetUrl"
-                />
-                <GhErrorMessage @errors={{@data.webhook.errors}} @property="targetUrl" data-test-error="webhook-targetUrl" />
-            </GhFormGroup>
-        </fieldset>
-        {{#if (enable-developer-experiments)}}
-            <fieldset>
-                <GhFormGroup @errors={{@data.webhook.errors}} @hasValidated={{@data.webhook.hasValidated}} @property="secret">
-                    <label for="webhook-secret" class="fw6">Secret</label>
-                    <input
-                        type="text"
-                        value={{@data.webhook.secret}}
-                        id="webhook-secret"
-                        class="gh-input mt1"
-                        placeholder="https://example.com"
-                        autocapitalize="off"
-                        autocorrect="off"
-                        {{on "input" (fn this.setProperty "secret")}}
-                        {{on "blur" (fn this.validate "secret")}}
-                        data-test-input="webhook-secret"
-                    />
-                    <GhErrorMessage @errors={{@data.webhook.errors}} @property="secret" data-test-error="webhook-secret" />
-                </GhFormGroup>
-            </fieldset>
-        {{/if}}
-        {{#if this.error}}
-            <p class="red">{{this.error}}</p>
-        {{/if}}
-    </div>
-
-    <div class="modal-footer">
-        <button
-            class="gh-btn" data-test-button="cancel-webhook" type="button" {{on "click" @close}}
-            {{!-- disable mouseDown so it doesn't trigger focus-out validations --}}
-            {{on "mousedown" this.noop}}
-        >
-            <span>Cancel</span>
-        </button>
-        <GhTaskButton
-            @buttonText={{this.buttonText}}
-            @successText={{this.successText}}
-            @task={{this.saveWebhookTask}}
-            @class="gh-btn gh-btn-black gh-btn-icon"
-            data-test-button="save-webhook" />
-    </div>
-</div>
\ No newline at end of file
diff --git a/ghost/admin/app/components/settings/integrations/webhook-form-modal.js b/ghost/admin/app/components/settings/integrations/webhook-form-modal.js
deleted file mode 100644
index de556bed0f7..00000000000
--- a/ghost/admin/app/components/settings/integrations/webhook-form-modal.js
+++ /dev/null
@@ -1,81 +0,0 @@
-import Component from '@glimmer/component';
-import Webhook from 'ghost-admin/models/webhook';
-import {AVAILABLE_EVENTS} from 'ghost-admin/helpers/event-name';
-import {action} from '@ember/object';
-import {camelize} from '@ember/string';
-import {inject as service} from '@ember/service';
-import {task} from 'ember-concurrency';
-import {tracked} from '@glimmer/tracking';
-
-export default class WebhookFormModal extends Component {
-    @service notifications;
-    @service router;
-
-    availableEvents = AVAILABLE_EVENTS;
-    buttonText = this.args.data.webhook.isNew ? 'Create' : 'Save';
-    successText = this.args.data.webhook.isNew ? 'Created' : 'Saved';
-
-    @tracked error = null;
-
-    get webhook() {
-        return this.args.data.webhook;
-    }
-
-    @action
-    setProperty(property, event) {
-        this.webhook[property] = event.target.value;
-    }
-
-    @action
-    selectEvent(value) {
-        this.webhook.event = value;
-        this.webhook.validate({property: 'event'});
-    }
-
-    @action
-    validate(property) {
-        return this.webhook.validate({property});
-    }
-
-    @action
-    noop(event) {
-        event.preventDefault();
-    }
-
-    @task({drop: true})
-    *saveWebhookTask() {
-        this.error = null;
-
-        try {
-            const webhook = yield this.webhook.save();
-            const integration = yield webhook.integration;
-            this.router.transitionTo('settings.integration', integration);
-            return true;
-        } catch (e) {
-            // TODO: server-side validation errors should be serialized
-            // properly so that errors are added to model.errors automatically
-            if (e && e.payload && e.payload.errors) {
-                const attrs = Array.from(Webhook.attributes.keys());
-
-                e.payload.errors.forEach((error) => {
-                    let {message, property = ''} = error;
-                    property = camelize(property);
-
-                    if (property && attrs.includes(property)) {
-                        this.webhook.errors.add(property, message);
-                        this.webhook.hasValidated.pushObject(property);
-                    } else {
-                        this.error = `Error: ${message}`;
-                    }
-                });
-
-                return;
-            }
-
-            // bubble up to the global error handler
-            if (e) {
-                throw e;
-            }
-        }
-    }
-}
diff --git a/ghost/admin/app/components/settings/labs/delete-all-content-modal.hbs b/ghost/admin/app/components/settings/labs/delete-all-content-modal.hbs
deleted file mode 100644
index 439ed50b4b1..00000000000
--- a/ghost/admin/app/components/settings/labs/delete-all-content-modal.hbs
+++ /dev/null
@@ -1,15 +0,0 @@
-<div class="modal-content" data-test-modal="confirm-delete-all">
-    <header class="modal-header">
-        <h1>Would you really like to delete all content from your blog?</h1>
-    </header>
-    <button type="button" class="close" title="Close" {{on "click" @close}}>{{svg-jar "close"}}<span class="hidden">Close</span></button>
-
-    <div class="modal-body">
-        <p>This is permanent! No backups, no restores, no magic undo button. We warned you, k?</p>
-    </div>
-
-    <div class="modal-footer">
-        <button class="gh-btn" type="button" {{on "click" @close}}><span>Cancel</span></button>
-        <GhTaskButton @buttonText="Delete" @successText="Deleted" @task={{this.deleteAllTask}} @class="gh-btn gh-btn-red gh-btn-icon" data-test-button="confirm" />
-    </div>
-</div>
\ No newline at end of file
diff --git a/ghost/admin/app/components/settings/labs/delete-all-content-modal.js b/ghost/admin/app/components/settings/labs/delete-all-content-modal.js
deleted file mode 100644
index bee17799e98..00000000000
--- a/ghost/admin/app/components/settings/labs/delete-all-content-modal.js
+++ /dev/null
@@ -1,28 +0,0 @@
-import Component from '@glimmer/component';
-import {inject as service} from '@ember/service';
-import {task} from 'ember-concurrency';
-
-export default class DeleteAllContentModal extends Component {
-    @service ajax;
-    @service ghostPaths;
-    @service notifications;
-    @service router;
-    @service store;
-
-    @task({drop: true})
-    *deleteAllTask() {
-        try {
-            const deleteUrl = this.ghostPaths.url.api('db');
-            yield this.ajax.del(deleteUrl);
-
-            this.store.unloadAll('post');
-            this.store.unloadAll('tag');
-
-            this.notifications.showAlert('All content deleted from database.', {type: 'success', key: 'all-content.delete.success'});
-        } catch (error) {
-            this.notifications.showAPIError(error, {key: 'all-content.delete'});
-        } finally {
-            this.args.close();
-        }
-    }
-}
diff --git a/ghost/admin/app/components/settings/members-comment-access.hbs b/ghost/admin/app/components/settings/members-comment-access.hbs
deleted file mode 100644
index f426b7c32b8..00000000000
--- a/ghost/admin/app/components/settings/members-comment-access.hbs
+++ /dev/null
@@ -1,26 +0,0 @@
-<div class="gh-setting-richdd-container comment-access-dropdown" data-test-members-comments-access>
-    <div class="gh-expandable-header">
-        <div>
-            <h4 class="gh-expandable-title">Commenting</h4>
-            <p class="gh-expandable-description">Who can comment on posts?</p>
-        </div>
-    </div>
-
-    <PowerSelect
-        @options={{this.options}}
-        @selected={{this.selectedOption}}
-        @onChange={{this.setCommentAccess}}
-        @disabled={{eq this.settings.membersSignupAccess "none"}}
-        @triggerClass="gh-setting-dropdown"
-        @dropdownClass="gh-setting-dropdown-list"
-        as |option|
-    >
-        <div class="gh-setting-dropdown-content" data-test-members-comments-access-option={{option.value}}>
-            {{svg-jar option.icon class=(concat "w8 h8 mr2 fill-" (or option.icon_color "green"))}}
-            <div class="gh-radio-label">
-                {{option.name}}<br>
-                <div class="gh-radio-desc">{{option.description}}</div>
-            </div>
-        </div>
-    </PowerSelect>
-</div>
diff --git a/ghost/admin/app/components/settings/members-comment-access.js b/ghost/admin/app/components/settings/members-comment-access.js
deleted file mode 100644
index 066a1ecced4..00000000000
--- a/ghost/admin/app/components/settings/members-comment-access.js
+++ /dev/null
@@ -1,39 +0,0 @@
-import Component from '@glimmer/component';
-import {action} from '@ember/object';
-import {inject as service} from '@ember/service';
-
-export default class SettingsMembersCommentAccess extends Component {
-    @service settings;
-
-    get options() {
-        return [{
-            name: 'Nobody',
-            description: 'Disable commenting completely',
-            value: 'off',
-            icon: 'no-members',
-            icon_color: 'midlightgrey-d2'
-        }, {
-            name: 'All members',
-            description: 'Logged-in members',
-            value: 'all',
-            icon: 'members-all',
-            icon_color: 'blue'
-        }, {
-            name: 'Paid-members only',
-            description: 'Only logged-in members with an active Stripe subscription',
-            value: 'paid',
-            icon: 'members-paid',
-            icon_color: 'pink'
-        }];
-    }
-
-    get selectedOption() {
-        return this.options.find(o => o.value === this.settings.commentsEnabled);
-    }
-
-    @action
-    setCommentAccess(option) {
-        this.settings.commentsEnabled = option.value;
-        this.args.onChange?.(option.value);
-    }
-}
diff --git a/ghost/admin/app/components/settings/members-default-post-access.hbs b/ghost/admin/app/components/settings/members-default-post-access.hbs
deleted file mode 100644
index 37bf0916bb6..00000000000
--- a/ghost/admin/app/components/settings/members-default-post-access.hbs
+++ /dev/null
@@ -1,42 +0,0 @@
-<div class="gh-setting-richdd-container" data-test-default-post-access>
-    <div class="gh-expandable-header">
-        <div>
-            <h4 class="gh-expandable-title">Default post access</h4>
-            <p class="gh-expandable-description">When a new post is created, who should have access?</p>
-        </div>
-    </div>
-
-    <PowerSelect
-        @options={{this.options}}
-        @selected={{this.selectedOption}}
-        @onChange={{this.setDefaultContentVisibility}}
-        @disabled={{eq this.settings.membersSignupAccess "none"}}
-        @triggerClass="gh-setting-dropdown"
-        @dropdownClass="gh-setting-dropdown-list"
-        as |option|
-    >
-        <div class="gh-setting-dropdown-content" data-test-default-post-access-option={{option.value}}>
-            {{svg-jar option.icon class=(concat "w8 h8 mr2 fill-" (or option.icon_color "green"))}}
-            <div class="gh-radio-label">
-                {{option.name}}<br>
-                <div class="gh-radio-desc">{{option.description}}</div>
-            </div>
-        </div>
-    </PowerSelect>
-    {{#if this.hasVisibilityFilter}}
-        <div class="mt2" data-test-default-post-access-tiers>
-            <GhPostSettingsMenu::VisibilitySegmentSelect
-                @selectDefaultTier={{true}}
-                @tiers={{this.visibilityTiers}}
-                @onChange={{action "setVisibility"}}
-                @renderInPlace={{true}}
-                @hideOptionsWhenAllSelected={{true}}
-            />
-            {{#if this.showSegmentError}}
-                <p class="response red">
-                    Please select at least one tier
-                </p>
-            {{/if}}
-        </div>
-    {{/if}}
-</div>
diff --git a/ghost/admin/app/components/settings/members-default-post-access.js b/ghost/admin/app/components/settings/members-default-post-access.js
deleted file mode 100644
index e6f5876cfb7..00000000000
--- a/ghost/admin/app/components/settings/members-default-post-access.js
+++ /dev/null
@@ -1,82 +0,0 @@
-import Component from '@glimmer/component';
-import {action} from '@ember/object';
-import {inject as service} from '@ember/service';
-import {tracked} from '@glimmer/tracking';
-
-export default class SettingsMembersDefaultPostAccess extends Component {
-    @service settings;
-    @service feature;
-    @tracked showSegmentError;
-
-    get options() {
-        return [{
-            name: 'Public',
-            description: 'All site visitors to your site, no login required',
-            value: 'public',
-            icon: 'globe',
-            icon_color: 'green'
-        }, {
-            name: 'Members only',
-            description: 'All logged-in members',
-            value: 'members',
-            icon: 'members-all',
-            icon_color: 'blue'
-        }, {
-            name: 'Paid-members only',
-            description: 'Only logged-in members with an active Stripe subscription',
-            value: 'paid',
-            icon: 'members-paid',
-            icon_color: 'pink'
-        }, {
-            name: 'Specific tier(s)',
-            description: 'Members with any of the selected tiers',
-            value: 'tiers',
-            icon: 'members-segment',
-            icon_color: 'yellow'
-        }];
-    }
-
-    get hasVisibilityFilter() {
-        return !['public', 'members', 'paid'].includes(this.settings.defaultContentVisibility);
-    }
-
-    get visibilityTiers() {
-        const visibilityTiersData = this.settings.defaultContentVisibilityTiers;
-        return (visibilityTiersData || []).map((id) => {
-            return {id};
-        });
-    }
-
-    get selectedOption() {
-        if (this.settings.membersSignupAccess === 'none') {
-            return this.options.find(o => o.value === 'public');
-        }
-
-        return this.options.find(o => o.value === this.settings.defaultContentVisibility);
-    }
-
-    @action
-    setVisibility(segment) {
-        if (segment) {
-            const tierIds = segment?.map((tier) => {
-                return tier.id;
-            });
-            this.settings.defaultContentVisibility = 'tiers';
-            this.settings.defaultContentVisibilityTiers = tierIds;
-            this.showSegmentError = false;
-        } else {
-            this.settings.defaultContentVisibility = '';
-            this.showSegmentError = true;
-        }
-    }
-
-    @action
-    setDefaultContentVisibility(option) {
-        if (this.settings.membersSignupAccess !== 'none') {
-            this.settings.defaultContentVisibility = option.value;
-            if (option.value === 'tiers') {
-                this.settings.defaultContentVisibilityTiers = [];
-            }
-        }
-    }
-}
diff --git a/ghost/admin/app/components/settings/members-email/default-recipients-select.hbs b/ghost/admin/app/components/settings/members-email/default-recipients-select.hbs
deleted file mode 100644
index b106b44bad2..00000000000
--- a/ghost/admin/app/components/settings/members-email/default-recipients-select.hbs
+++ /dev/null
@@ -1,26 +0,0 @@
-<PowerSelect
-    @options={{this.options}}
-    @selected={{this.selectedOption}}
-    @onChange={{this.setRecipients}}
-    @triggerClass="gh-setting-dropdown"
-    @dropdownClass="gh-setting-dropdown-list"
-    as |option|
->
-    <div class="gh-setting-dropdown-content">
-        {{svg-jar option.icon class=(concat "w8 h8 mr2 fill-" (or option.icon_color "green"))}}
-        <div class="gh-radio-label">
-            {{option.name}}<br>
-            <div class="gh-radio-desc">{{option.description}}</div>
-        </div>
-    </div>
-</PowerSelect>
-
-{{#if (eq @recipients "segment")}}
-    <div class="gh-setting-large-dropdown mt2">
-        <GhMembersSegmentSelect
-            @segment={{@segment}}
-            @onChange={{@onSegmentChange}}
-            @enforcedCountFilter="newsletters.status:active"
-        />
-    </div>
-{{/if}}
diff --git a/ghost/admin/app/components/settings/members-email/default-recipients-select.js b/ghost/admin/app/components/settings/members-email/default-recipients-select.js
deleted file mode 100644
index 67cd01c08c0..00000000000
--- a/ghost/admin/app/components/settings/members-email/default-recipients-select.js
+++ /dev/null
@@ -1,47 +0,0 @@
-import Component from '@glimmer/component';
-import {action} from '@ember/object';
-
-export default class SettingsDefaultEmailRecipientsComponent extends Component {
-    get options() {
-        return [{
-            name: 'Whoever has access to the post',
-            description: 'Free posts to everyone, premium posts sent to paid members',
-            value: 'visibility',
-            icon: 'members-post',
-            icon_color: 'green'
-        }, {
-            name: 'All members',
-            description: 'Everyone who is subscribed to newsletter updates, whether free or paid members',
-            value: 'all-members',
-            icon: 'members-all',
-            icon_color: 'blue'
-        }, {
-            name: 'Paid-members only',
-            description: 'People who have a premium subscription',
-            value: 'paid-only',
-            icon: 'members-paid',
-            icon_color: 'pink'
-        }, {
-            name: 'Specific people',
-            description: 'Only people with any of the selected tiers or labels',
-            value: 'segment',
-            icon: 'members-segment',
-            icon_color: 'yellow'
-        }, {
-            name: 'Usually nobody',
-            description: 'Newsletters are off for new posts, but can be enabled when needed',
-            value: 'none',
-            icon: 'no-members',
-            icon_color: 'midlightgrey-d2'
-        }];
-    }
-
-    get selectedOption() {
-        return this.options.find(o => o.value === this.args.recipients);
-    }
-
-    @action
-    setRecipients(option) {
-        this.args.onRecipientsChange(option.value);
-    }
-}
diff --git a/ghost/admin/app/components/settings/members-subscription-access.hbs b/ghost/admin/app/components/settings/members-subscription-access.hbs
deleted file mode 100644
index 4091eaf787b..00000000000
--- a/ghost/admin/app/components/settings/members-subscription-access.hbs
+++ /dev/null
@@ -1,25 +0,0 @@
-<div class="gh-setting-richdd-container" data-test-members-subscription-access>
-    <div class="gh-expandable-header">
-        <div>
-            <h4 class="gh-expandable-title">Subscription access</h4>
-            <p class="gh-expandable-description">Who should be able to subscribe to your site?</p>
-        </div>
-    </div>
-
-    <PowerSelect
-        @options={{this.options}}
-        @selected={{this.selectedOption}}
-        @onChange={{this.setSignupAccess}}
-        @triggerClass="gh-setting-dropdown"
-        @dropdownClass="gh-setting-dropdown-list"
-        as |option|
-    >
-        <div class="gh-setting-dropdown-content" data-test-members-subscription-option={{option.value}}>
-            {{svg-jar option.icon class=(concat "w8 h8 mr2 fill-" (or option.icon_color "green"))}}
-            <div class="gh-radio-label">
-                {{option.name}}<br>
-                <div class="gh-radio-desc">{{option.description}}</div>
-            </div>
-        </div>
-    </PowerSelect>
-</div>
\ No newline at end of file
diff --git a/ghost/admin/app/components/settings/members-subscription-access.js b/ghost/admin/app/components/settings/members-subscription-access.js
deleted file mode 100644
index fdc8d22c752..00000000000
--- a/ghost/admin/app/components/settings/members-subscription-access.js
+++ /dev/null
@@ -1,43 +0,0 @@
-import Component from '@glimmer/component';
-import {action} from '@ember/object';
-import {inject as service} from '@ember/service';
-
-export default class SettingsMembersSubscriptionAccess extends Component {
-    @service settings;
-
-    get options() {
-        return [{
-            name: 'Anyone can sign up',
-            description: 'All visitors will be able to subscribe and sign in',
-            value: 'all',
-            icon: 'globe',
-            icon_color: 'green'
-        }, {
-            name: 'Only people I invite',
-            description: 'People can sign in from your site but won\'t be able to sign up',
-            value: 'invite',
-            icon: 'email-love-letter',
-            icon_color: 'blue'
-        }, {
-            name: 'Nobody',
-            description: 'Disable all member features, including newsletters',
-            value: 'none',
-            icon: 'no-members',
-            icon_color: 'midlightgrey-d2'
-        }];
-    }
-
-    get selectedOption() {
-        return this.options.find(o => o.value === this.settings.membersSignupAccess);
-    }
-
-    @action
-    setSignupAccess(option) {
-        this.settings.membersSignupAccess = option.value;
-        this.args.onChange?.(option.value);
-
-        if (option.value === 'none') {
-            this.settings.defaultContentVisibility = 'public';
-        }
-    }
-}
diff --git a/ghost/admin/app/components/settings/members/archive-tier.hbs b/ghost/admin/app/components/settings/members/archive-tier.hbs
deleted file mode 100644
index 78d478cd54f..00000000000
--- a/ghost/admin/app/components/settings/members/archive-tier.hbs
+++ /dev/null
@@ -1,19 +0,0 @@
-{{#if this.tier.active}}
-    {{#unless this.tier.isNew}}
-        <button
-            type="button"
-            data-test-button="archive-tier"
-            {{on "click" this.handleArchiveTier}}
-        >
-            <span>Archive</span>
-        </button>
-    {{/unless}}
-{{else}}
-    <button
-        type="button"
-        data-test-button="unarchive-tier"
-        {{on "click" this.handleUnarchiveTier}}
-    >
-        <span>Reactivate</span>
-    </button>
-{{/if}}
\ No newline at end of file
diff --git a/ghost/admin/app/components/settings/members/archive-tier.js b/ghost/admin/app/components/settings/members/archive-tier.js
deleted file mode 100644
index b7dfc9124f1..00000000000
--- a/ghost/admin/app/components/settings/members/archive-tier.js
+++ /dev/null
@@ -1,42 +0,0 @@
-import Component from '@glimmer/component';
-import {action} from '@ember/object';
-import {inject as service} from '@ember/service';
-
-export default class ArchiveTierComponent extends Component {
-    @service notifications;
-    @service router;
-    @service modals;
-
-    get isActive() {
-        const {tier} = this.args;
-        return !!tier.active;
-    }
-
-    get tier() {
-        return this.args.tier;
-    }
-
-    @action
-    handleArchiveTier() {
-        if (!this.tier.isNew) {
-            this.modals.open('modals/tiers/archive', {
-                tier: this.tier,
-                onArchive: this.args.onArchive
-            }, {
-                className: 'fullscreen-modal fullscreen-modal-action fullscreen-modal-wide'
-            });
-        }
-    }
-
-    @action
-    handleUnarchiveTier() {
-        if (!this.tier.isNew) {
-            this.modals.open('modals/tiers/unarchive', {
-                tier: this.tier,
-                onUnarchive: this.args.onUnarchive
-            }, {
-                className: 'fullscreen-modal fullscreen-modal-action fullscreen-modal-wide'
-            });
-        }
-    }
-}
diff --git a/ghost/admin/app/components/settings/members/stripe-settings-form.hbs b/ghost/admin/app/components/settings/members/stripe-settings-form.hbs
deleted file mode 100644
index 34bfbb32f28..00000000000
--- a/ghost/admin/app/components/settings/members/stripe-settings-form.hbs
+++ /dev/null
@@ -1,164 +0,0 @@
-<div class="gh-main-section">
-    {{#if this.stripeDirect}}
-        <section>
-            <div class="flex flex-column flex-row-l items-start justify-between">
-                <div class="w-100 w-50-l">
-                    <div class="mb4">
-                        <label class="fw6 f8" for="stripe-publishable-key">Stripe Publishable key</label>
-                        <input
-                            type="text"
-                            id="stripe-publishable-key"
-                            class="gh-input mt1 password"
-                            value={{this.stripeDirectPublicKey}}
-                            {{on "input" this.setStripeDirectPublicKey}}
-                        />
-                    </div>
-                    <div class="nudge-top--3">
-                        <label class="fw6 f8 mt4" for="stripe-secret-key">Stripe Secret key</label>
-                        <input
-                            type="text"
-                            id="stripe-secret-key"
-                            class="gh-input mt1 password"
-                            value={{this.stripeDirectSecretKey}}
-                            {{on "input" this.setStripeDirectSecretKey}}
-                        />
-                        <a href="https://dashboard.stripe.com/account/apikeys" target="_blank" class="mt1 fw4 f8" rel="noopener noreferrer">
-                            Find your Stripe API keys here &raquo;
-                        </a>
-                    </div>
-                </div>
-                <div class="ml0 ml5-l mt6">
-                    <div class="gh-members-stripe-info">
-                        <div class="gh-members-stripe-info-header">
-                            <h4>How you get paid</h4>
-                            {{svg-jar "stripe-verified-partner-badge" class="gh-members-stripe-badge"}}
-                        </div>
-                        <p class="f8 mt2 mb0">
-                            Stripe is our exclusive direct payments partner.<br />
-                            Ghost collects <strong>no fees</strong> on any payments! If you don’t have a Stripe account yet, you can <a href="https://stripe.com" target="_blank" rel="noopener noreferrer" class="gh-members-stripe-link">sign up here</a>.
-                        </p>
-                    </div>
-                </div>
-            </div>
-        </section>
-
-        <div class="mb4 mt4 flex justify-end">
-            <GhTaskButton
-                @buttonText="Save settings"
-                @task={{this.saveSettingsTask}}
-                @successText="Saved"
-                @runningText="Saving"
-                @class="gh-btn gh-btn-primary gh-btn-icon"
-                data-test-button="save-members-settings"
-            />
-        </div>
-
-    {{else}}
-
-        {{#if (and this.stripeConnectAccountId (not this.saveStripeSettingsTask.isRunning))}}
-            <button type="button" class="gh-btn gh-btn-stripe-disconnect" data-test-button="stripe-disconnect" {{on "click" this.openDisconnectStripeModal}}><span>Disconnect</span></button>
-            <div class="gh-stripe-connected-container">
-                <div class="gh-logos-stripe-connect">
-                    <div class="gh-logo-squircle" style="background-image:url(assets/img/orb-squircle.png);"></div>
-                    <div class="gh-logo-squircle" style="background-image:url(assets/img/stripe.svg);"></div>
-                </div>
-                <h1>You are connected to Stripe</h1>
-                <div class="gh-stripe-connected-info">
-                    <div class="gh-stripe-site-title">
-                        <p>Connected to <a href="https://dashboard.stripe.com/{{this.stripeConnectAccountId}}" target="_blank" rel="noopener noreferrer">{{this.stripeConnectAccountName}}</a></p>
-                        {{#unless this.stripeConnectLivemode}}
-                            <div class="gh-members-connect-testmodelabel">Test mode</div>
-                        {{/unless}}
-                    </div>
-
-                    {{#if this.hasActiveStripeSubscriptions}}
-                    <span class="gh-stripe-error-hasactivesub">
-                        Cannot disconnect while there are members with active Stripe subscriptions.
-                    </span>
-                    {{/if}}
-                </div>
-                <div class="gh-stripe-guide-container">
-                    <p>read next</p>
-                    <a class="gh-stripe-guide" href="https://ghost.org/resources/managing-your-stripe-account/?ref=admin" target="_blank" rel="noopener noreferrer">
-                        <div class="gh-stripe-guide-content">
-                            <div class="gh-stripe-guide-content-body">
-                                <h3>How to setup and manage your Stripe account</h3>
-                                <p>Learn how to configure your Stripe account to work with Ghost, from custom branding to payment receipt emails.</p>
-                            </div>
-                            <div class="gh-stripe-guide-content-footer">
-                                {{svg-jar "ghost-orb-pink"}}
-                                <h4>Ghost Resources</h4>
-                                <span>&middot;</span>
-                                <p>Kym Ellis</p>
-                            </div>
-                        </div>
-                        <div class="gh-stripe-guide-image">
-                            <img src="https://ghost.org/resources/content/images/2022/02/Stripe---Home.jpg" alt="Stripe guide on Ghost Resources"/>
-                        </div>
-                    </a>
-                </div>
-            </div>
-        {{else}}
-            <div class="flex flex-column flex-row-l items-start justify-between">
-                <div class="w-100 w-50-l">
-                    <label class="fw6 f8">Generate secure key</label>
-                    <div class="flex items-center mb4 justify-between gh-members-connectbutton-container mt2">
-                        <a href="{{if this.stripeConnectTestMode this.testStripeConnectAuthUrl this.liveStripeConnectAuthUrl}}" class="stripe-connect" target="_blank" rel="noopener noreferrer"><span></span></a>
-                        <div class="ml2 flex items-center flex-nowrap">
-                            <span class="mr2 f8 midgrey nowrap {{if this.stripeConnectTestMode "gh-members-connect-testmodeon"}}">{{if this.stripeConnectTestMode "Using" "Use"}} test mode</span>
-                            <div class="for-switch small">
-                                <label class="switch" for="stripe-connect-test-mode">
-                                    <input type="checkbox" id="stripe-connect-test-mode" class="gh-input" checked={{this.stripeConnectTestMode}} {{on "input" this.setStripeConnectTestMode}} aria-label="Use Stripe test mode" data-test-checkbox="stripe-connect-test-mode">
-                                    <span class="input-toggle-component mt1"></span>
-                                </label>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="nudge-top--3">
-                        <textarea
-                            class="gh-input gh-members-stripe-connect-token"
-                            placeholder="Paste your secure key here"
-                            aria-label="Stripe connect secure key"
-                            {{on "input" this.setStripeConnectIntegrationToken}}
-                        ></textarea>
-                        {{#if this.stripeConnectError}}<p class="mb0 mt2 f8 red">{{this.stripeConnectError}}</p>{{/if}}
-                    </div>
-                </div>
-                <div class="mt5 mt5-m mt8-l ml0 ml5-l">
-                    <div class="gh-members-stripe-info">
-                        <div class="gh-members-stripe-info-header">
-                            <h4>Getting paid</h4>
-                            {{svg-jar "stripe-verified-partner-badge" class="gh-members-stripe-badge"}}
-                        </div>
-                        <p class="f8 mt2 mb0">
-                            Stripe is our exclusive direct payments partner.<br />
-                            Ghost collects <strong>no fees</strong> on any payments! If you don’t have a Stripe account yet, you can <a href="https://stripe.com" target="_blank" rel="noopener noreferrer" class="gh-members-stripe-link">sign up here</a>.
-                        </p>
-                    </div>
-                </div>
-            </div>
-
-            <div class="gh-members-connect-savecontainer {{if this.settings.stripeConnectIntegrationToken "expanded"}}">
-                <GhTaskButton
-                    @buttonText="Save Stripe settings"
-                    @task={{this.saveStripeSettingsTask}}
-                    @unlinkedTask={{true}}
-                    @successText="Saved"
-                    @disabled={{is-empty this.settings.stripeConnectIntegrationToken}}
-                    @runningText="Saving"
-                    @class="gh-btn gh-btn-green gh-btn-icon"
-                />
-            </div>
-        {{/if}}
-    {{/if}}
-</div>
-
-{{#if this.showDisconnectStripeConnectModal}}
-    <GhFullscreenModal @modal="disconnect-stripe"
-        @model={{hash
-            stripeConnectAccountName=this.stripeConnectAccountName
-        }}
-        @confirm={{this.disconnectStripeConnectIntegration}}
-        @close={{this.closeDisconnectStripeModal}}
-        @modifier="action wide" />
-{{/if}}
diff --git a/ghost/admin/app/components/settings/members/stripe-settings-form.js b/ghost/admin/app/components/settings/members/stripe-settings-form.js
deleted file mode 100644
index c35c2c400b7..00000000000
--- a/ghost/admin/app/components/settings/members/stripe-settings-form.js
+++ /dev/null
@@ -1,335 +0,0 @@
-import Component from '@glimmer/component';
-import {action} from '@ember/object';
-import {currencies} from 'ghost-admin/utils/currency';
-import {inject} from 'ghost-admin/decorators/inject';
-import {inject as service} from '@ember/service';
-import {task, timeout} from 'ember-concurrency';
-import {tracked} from '@glimmer/tracking';
-
-const RETRY_PRODUCT_SAVE_POLL_LENGTH = 1000;
-const RETRY_PRODUCT_SAVE_MAX_POLL = 15 * RETRY_PRODUCT_SAVE_POLL_LENGTH;
-
-const NO_OF_TOP_CURRENCIES = 5;
-
-export default class StripeSettingsForm extends Component {
-    @service ghostPaths;
-    @service ajax;
-    @service settings;
-    @service membersUtils;
-    @service store;
-
-    @inject config;
-
-    @tracked hasActiveStripeSubscriptions = false;
-    @tracked showDisconnectStripeConnectModal = false;
-    @tracked stripeConnectError = null;
-    @tracked stripeConnectTestMode = false;
-    @tracked stripeDirect = false;
-    @tracked stripePlanInvalidAmount = false;
-
-    @tracked _scratchStripeYearlyAmount = null;
-    @tracked _scratchStripeMonthlyAmount = null;
-
-    topCurrencies = currencies.slice(0, NO_OF_TOP_CURRENCIES).map((currency) => {
-        return {
-            value: currency.isoCode.toLowerCase(),
-            label: `${currency.isoCode} - ${currency.name}`,
-            isoCode: currency.isoCode
-        };
-    });
-
-    currencies = currencies.slice(NO_OF_TOP_CURRENCIES, currencies.length).map((currency) => {
-        return {
-            value: currency.isoCode.toLowerCase(),
-            label: `${currency.isoCode} - ${currency.name}`,
-            isoCode: currency.isoCode
-        };
-    });
-
-    allCurrencies = [
-        {
-            groupName: '—',
-            options: this.topCurrencies
-        },
-        {
-            groupName: '—',
-            options: this.currencies
-        }
-    ];
-
-    /** OLD **/
-    get stripeDirectPublicKey() {
-        return this.settings.stripePublishableKey;
-    }
-    get stripeDirectSecretKey() {
-        return this.settings.stripeSecretKey;
-    }
-
-    get stripeConnectAccountId() {
-        return this.settings.stripeConnectAccountId;
-    }
-    get stripeConnectAccountName() {
-        return this.settings.stripeConnectDisplayName;
-    }
-    get stripeConnectLivemode() {
-        return this.settings.stripeConnectLivemode;
-    }
-
-    get selectedCurrency() {
-        return this.currencies.findBy('value', this.stripePlans.monthly.currency)
-            || this.topCurrencies.findBy('value', this.stripePlans.monthly.currency);
-    }
-
-    get stripePlans() {
-        const plans = this.settings.stripePlans;
-        const monthly = plans.find(plan => plan.interval === 'month');
-        const yearly = plans.find(plan => plan.interval === 'year' && plan.name !== 'Complimentary');
-
-        return {
-            monthly: {
-                amount: parseInt(monthly.amount) / 100 || 5,
-                currency: monthly.currency
-            },
-            yearly: {
-                amount: parseInt(yearly.amount) / 100 || 50,
-                currency: yearly.currency
-            }
-        };
-    }
-
-    get liveStripeConnectAuthUrl() {
-        return this.ghostPaths.url.api('members/stripe_connect') + '?mode=live';
-    }
-
-    get testStripeConnectAuthUrl() {
-        return this.ghostPaths.url.api('members/stripe_connect') + '?mode=test';
-    }
-
-    constructor() {
-        super(...arguments);
-
-        // Allow disabling stripe direct keys if stripe is still enabled, while the config is disabled
-        this.updateStripeDirect();
-    }
-
-    @action
-    setStripeDirectPublicKey(event) {
-        this.settings.stripeProductName = this.settings.title;
-        this.settings.stripePublishableKey = event.target.value;
-    }
-
-    @action
-    setStripeDirectSecretKey(event) {
-        this.settings.stripeProductName = this.settings.title;
-        this.settings.stripeSecretKey = event.target.value;
-    }
-
-    @action
-    setStripeConnectTestMode(event) {
-        this.stripeConnectTestMode = event.target.checked;
-    }
-
-    @action
-    setStripePlansCurrency(event) {
-        const newCurrency = event.value;
-        const updatedPlans = this.settings.stripePlans.map((plan) => {
-            if (plan.name !== 'Complimentary') {
-                return Object.assign({}, plan, {
-                    currency: newCurrency
-                });
-            }
-            return plan;
-        });
-
-        const currentComplimentaryPlan = updatedPlans.find((plan) => {
-            return plan.name === 'Complimentary' && plan.currency === event.value;
-        });
-
-        if (!currentComplimentaryPlan) {
-            updatedPlans.push({
-                name: 'Complimentary',
-                currency: event.value,
-                interval: 'year',
-                amount: 0
-            });
-        }
-
-        this.settings.stripePlans = updatedPlans;
-        this._scratchStripeYearlyAmount = null;
-        this._scratchStripeMonthlyAmount = null;
-        this.validateStripePlans();
-    }
-
-    @action
-    setStripeConnectIntegrationToken(event) {
-        this.settings.stripeProductName = this.settings.title;
-        this.args.setStripeConnectIntegrationTokenSetting(event.target.value);
-    }
-
-    @action
-    openDisconnectStripeModal() {
-        this.openDisconnectStripeConnectModalTask.perform();
-    }
-
-    @action
-    closeDisconnectStripeModal() {
-        this.showDisconnectStripeConnectModal = false;
-    }
-
-    @action
-    disconnectStripeConnectIntegration() {
-        this.disconnectStripeConnectIntegrationTask.perform();
-    }
-
-    @action
-    updateStripeDirect() {
-        // Allow disabling stripe direct keys if stripe is still enabled, while the config is disabled
-        this.stripeDirect = this.config.stripeDirect
-            || (this.membersUtils.isStripeEnabled && !this.settings.stripeConnectAccountId);
-    }
-
-    @action
-    validateStripePlans() {
-        this.settings.errors.remove('stripePlans');
-        this.settings.hasValidated.removeObject('stripePlans');
-
-        if (this._scratchStripeYearlyAmount === null) {
-            this._scratchStripeYearlyAmount = this.stripePlans.yearly.amount;
-        }
-        if (this._scratchStripeMonthlyAmount === null) {
-            this._scratchStripeMonthlyAmount = this.stripePlans.monthly.amount;
-        }
-
-        try {
-            const selectedCurrency = this.selectedCurrency;
-            const yearlyAmount = parseInt(this._scratchStripeYearlyAmount);
-            const monthlyAmount = parseInt(this._scratchStripeMonthlyAmount);
-            if (!yearlyAmount || yearlyAmount < 1 || !monthlyAmount || monthlyAmount < 1) {
-                const minimum = Intl.NumberFormat(this.settings.locale, {
-                    currency: selectedCurrency.isoCode,
-                    style: 'currency'
-                }).format(1);
-
-                throw new TypeError(`Subscription amount must be at least ${minimum}`);
-            }
-
-            const updatedPlans = this.settings.stripePlans.map((plan) => {
-                if (plan.name !== 'Complimentary') {
-                    let newAmount;
-                    if (plan.interval === 'year') {
-                        newAmount = Math.round(yearlyAmount * 100);
-                    } else if (plan.interval === 'month') {
-                        newAmount = Math.round(monthlyAmount * 100);
-                    }
-                    return Object.assign({}, plan, {
-                        amount: newAmount
-                    });
-                }
-                return plan;
-            });
-
-            this.settings.stripePlans = updatedPlans;
-        } catch (err) {
-            this.settings.errors.add('stripePlans', err.message);
-        } finally {
-            this.settings.hasValidated.pushObject('stripePlans');
-        }
-    }
-
-    @task({drop: true})
-    *openDisconnectStripeConnectModalTask() {
-        this.hasActiveStripeSubscriptions = false;
-        if (!this.stripeConnectAccountId) {
-            return;
-        }
-        const url = this.ghostPaths.url.api('/members/') + '?filter=status:paid&limit=0';
-        const response = yield this.ajax.request(url);
-
-        if (response?.meta?.pagination?.total !== 0) {
-            this.hasActiveStripeSubscriptions = true;
-            return;
-        }
-        this.showDisconnectStripeConnectModal = true;
-    }
-
-    @task
-    *disconnectStripeConnectIntegrationTask() {
-        const url = this.ghostPaths.url.api('/settings/stripe/connect');
-
-        yield this.ajax.delete(url);
-        yield this.settings.reload();
-
-        this.args.reset?.();
-        this.args.onDisconnected?.();
-    }
-
-    @task
-    *saveTier() {
-        const tiers = yield this.store.query('tier', {filter: 'type:paid', include: 'monthly_price, yearly_price'});
-        const tier = tiers.firstObject;
-
-        if (tier) {
-            tier.monthlyPrice = 500;
-            tier.yearlyPrice = 5000;
-            tier.currency = 'usd';
-
-            let pollTimeout = 0;
-            /** To allow Stripe config to be ready in backend, we poll the save tier request */
-            while (pollTimeout < RETRY_PRODUCT_SAVE_MAX_POLL) {
-                yield timeout(RETRY_PRODUCT_SAVE_POLL_LENGTH);
-
-                try {
-                    const updatedTier = yield tier.save();
-
-                    // Reload in the background (no await here)
-                    this.membersUtils.reload();
-                    return updatedTier;
-                } catch (error) {
-                    if (error.payload?.errors && error.payload.errors[0].code === 'STRIPE_NOT_CONFIGURED') {
-                        pollTimeout += RETRY_PRODUCT_SAVE_POLL_LENGTH;
-                        // no-op: will try saving again as stripe is not ready
-                        continue;
-                    } else {
-                        throw error;
-                    }
-                }
-            }
-        }
-        return tier;
-    }
-
-    @task({drop: true})
-    *saveStripeSettingsTask() {
-        this.stripeConnectError = null;
-
-        if (this.settings.stripeConnectIntegrationToken) {
-            try {
-                let response = yield this.settings.save();
-
-                yield this.saveTier.perform();
-                this.settings.portalPlans = ['free', 'monthly', 'yearly'];
-
-                response = yield this.settings.save();
-
-                this.args.onConnected?.();
-
-                return response;
-            } catch (error) {
-                if (error.payload && error.payload.errors) {
-                    this.stripeConnectError = 'Invalid secure key';
-                    return false;
-                }
-                throw error;
-            }
-        } else {
-            this.stripeConnectError = 'Please enter a secure key';
-        }
-    }
-
-    @task({drop: true})
-    *saveSettingsTask() {
-        yield this.settings.save();
-        this.updateStripeDirect();
-        return this.settings;
-    }
-}
diff --git a/ghost/admin/app/components/settings/navigation/nav-item-url-input.js b/ghost/admin/app/components/settings/navigation/nav-item-url-input.js
deleted file mode 100644
index 90aeb19eb7c..00000000000
--- a/ghost/admin/app/components/settings/navigation/nav-item-url-input.js
+++ /dev/null
@@ -1,170 +0,0 @@
-import TextField from '@ember/component/text-field';
-import classic from 'ember-classic-decorator';
-import validator from 'validator';
-import {classNames} from '@ember-decorators/component';
-import {computed} from '@ember/object';
-import {run} from '@ember/runloop';
-
-// URI is attached to the window global as part of the
-// google-caja html-css-sanitizer-bundle
-const {URI} = window;
-
-let joinUrlParts = function (url, path) {
-    if (path[0] !== '/' && url.slice(-1) !== '/') {
-        path = `/${path}`;
-    } else if (path[0] === '/' && url.slice(-1) === '/') {
-        path = path.slice(1);
-    }
-
-    return url + path;
-};
-
-let isRelative = function (url) {
-    // "protocol://", "//example.com", "scheme:", "#anchor", & invalid paths
-    // should all be treated as absolute
-    return !url.match(/\s/) && !validator.isURL(url) && !url.match(/^(\/\/|#|[a-zA-Z0-9-]+:)/);
-};
-
-@classic
-@classNames('gh-input')
-export default class GhNavitemUrlInput extends TextField {
-    // Allowed actions
-    update() {}
-
-    clearErrors() {}
-
-    @computed('baseUrl', 'value')
-    get isBaseUrl() {
-        return this.baseUrl === this.value;
-    }
-
-    didReceiveAttrs() {
-        super.didReceiveAttrs(...arguments);
-        // value coming is likely to be relative but we always want to show
-        // absolute urls in the input fields
-        this.set('value', this._makeAbsoluteUrl(this.url));
-    }
-
-    focusIn(event) {
-        this.set('hasFocus', true);
-
-        if (this.isBaseUrl) {
-            // position the cursor at the end of the input
-            run.next(function (el) {
-                let {length} = el.value;
-
-                el.setSelectionRange(length, length);
-            }, event.target);
-        }
-    }
-
-    keyDown(event) {
-        // delete the "placeholder" value all at once
-        if (this.isBaseUrl && (event.keyCode === 8 || event.keyCode === 46)) {
-            this.set('value', '');
-
-            event.preventDefault();
-        }
-
-        // CMD-S
-        if (event.keyCode === 83 && event.metaKey) {
-            this.notifyUrlChanged();
-        }
-    }
-
-    keyPress(event) {
-        this.clearErrors();
-
-        // enter key
-        if (event.keyCode === 13) {
-            this.notifyUrlChanged();
-        }
-
-        return true;
-    }
-
-    focusOut() {
-        this.set('hasFocus', false);
-
-        this.notifyUrlChanged();
-    }
-
-    notifyUrlChanged() {
-        let url = this.value.trim();
-        let urlURI = URI.parse(url);
-        let baseUrl = this.baseUrl;
-        let baseURI = URI.parse(baseUrl);
-
-        function getHost(uri) {
-            let host = uri.getDomain();
-
-            if (uri.getPort()) {
-                host = `${host}:${uri.getPort()}`;
-            }
-
-            return host;
-        }
-
-        let urlHost = getHost(urlURI);
-        let baseHost = getHost(baseURI);
-
-        // ensure value property is trimmed
-        this.set('value', url);
-
-        // if we have an email address, add the mailto:
-        if (validator.isEmail(url)) {
-            url = this.update(`mailto:${url}`);
-            this.set('value', url);
-            return;
-        }
-
-        // get our baseUrl relativity checks in order
-        let isAnchorLink = url.match(/^#/);
-        let isRelativeToBasePath = urlURI.getPath() && urlURI.getPath().indexOf(baseURI.getPath()) === 0;
-
-        // if our path is only missing a trailing / mark it as relative
-        if (`${urlURI.getPath()}/` === baseURI.getPath()) {
-            isRelativeToBasePath = true;
-        }
-
-        let isOnSameHost = urlHost === baseHost || (!urlHost && isRelativeToBasePath);
-
-        // if relative to baseUrl, remove the base url before sending to action
-        if (!isAnchorLink && isOnSameHost && isRelativeToBasePath) {
-            url = url.replace(/^[a-zA-Z0-9-]+:/, '');
-            url = url.replace(/^\/\//, '');
-            url = url.replace(baseHost, '');
-            url = url.replace(baseURI.getPath(), '');
-
-            // handle case where url path is same as baseUrl path but missing trailing slash
-            if (urlURI.getPath().slice(-1) !== '/') {
-                url = url.replace(baseURI.getPath().slice(0, -1), '');
-            }
-
-            if (url !== '' || !this.isNew) {
-                if (!url.match(/^\//)) {
-                    url = `/${url}`;
-                }
-
-                if (!url.match(/\/$/) && !url.match(/[.#?]/)) {
-                    url = `${url}/`;
-                }
-            }
-        }
-
-        // we update with the relative URL but then transform it back to absolute
-        // for the input value. This avoids problems where the underlying relative
-        // value hasn't changed even though the input value has
-        if (url.match(/^(\/\/|#|[a-zA-Z0-9-]+:)/) || validator.isURL(url) || validator.isURL(`${baseHost}${url}`)) {
-            url = this.update(url);
-            this.set('value', this._makeAbsoluteUrl(url));
-        }
-    }
-
-    _makeAbsoluteUrl(url) {
-        if (isRelative(url)) {
-            url = joinUrlParts(this.baseUrl, url);
-        }
-        return url;
-    }
-}
diff --git a/ghost/admin/app/components/settings/navigation/nav-item.hbs b/ghost/admin/app/components/settings/navigation/nav-item.hbs
deleted file mode 100644
index b0459a0078e..00000000000
--- a/ghost/admin/app/components/settings/navigation/nav-item.hbs
+++ /dev/null
@@ -1,42 +0,0 @@
-{{#unless this.navItem.isNew}}
-    <span class="gh-blognav-grab">
-        {{svg-jar "grab"}}
-        <span class="sr-only">Reorder</span>
-    </span>
-{{/unless}}
-
-<div class="gh-blognav-line">
-    <span class="gh-blognav-label" {{validation-status errors=this.navItem.errors property="label" hasValidated=this.navItem.hasValidated}}>
-        <GhTrimFocusInput
-            @shouldFocus={{this.navItem.last}}
-            @placeholder="Label"
-            @value={{readonly this.label}}
-            @input={{action "updateLabel" value="target.value"}}
-            @keyPress={{action "clearLabelErrors"}}
-            @focus-out={{action "updateLabel" this.label}} data-test-input="label" />
-        <GhErrorMessage
-            @errors={{this.navItem.errors}}
-            @property="label" data-test-error="label" />
-    </span>
-    <span class="gh-blognav-url" {{validation-status errors=this.navItem.errors property="url" hasValidated=this.navItem.hasValidated}}>
-        <Settings::Navigation::NavItemUrlInput
-            @baseUrl={{this.baseUrl}}
-            @isNew={{this.navItem.isNew}}
-            @url={{readonly this.url}}
-            @update={{action "updateUrl"}}
-            @clearErrors={{action "clearUrlErrors"}} data-test-input="url" />
-        <GhErrorMessage
-            @errors={{this.navItem.errors}}
-            @property="url" data-test-error="url" />
-    </span>
-</div>
-
-{{#if this.navItem.isNew}}
-    <button type="button" class="gh-blognav-add" {{action "addItem" this.navItem}}>
-        {{svg-jar "plus"}}<span class="sr-only">Add</span>
-    </button>
-{{else}}
-    <button type="button" class="gh-blognav-delete" {{action "deleteItem" this.navItem}}>
-        {{svg-jar "trash"}}<span class="sr-only">Delete</span>
-    </button>
-{{/if}}
diff --git a/ghost/admin/app/components/settings/navigation/nav-item.js b/ghost/admin/app/components/settings/navigation/nav-item.js
deleted file mode 100644
index cf1cc368516..00000000000
--- a/ghost/admin/app/components/settings/navigation/nav-item.js
+++ /dev/null
@@ -1,62 +0,0 @@
-import Component from '@ember/component';
-import ValidationState from 'ghost-admin/mixins/validation-state';
-import boundOneWay from 'ghost-admin/utils/bound-one-way';
-import {computed} from '@ember/object';
-import {readOnly} from '@ember/object/computed';
-import {run} from '@ember/runloop';
-
-export default Component.extend(ValidationState, {
-    classNames: 'gh-blognav-item',
-    classNameBindings: ['errorClass', 'navItem.isNew::gh-blognav-item--sortable'],
-
-    new: false,
-
-    // closure actions
-    addItem() {},
-    deleteItem() {},
-    updateUrl() {},
-    updateLabel() {},
-    label: boundOneWay('navItem.label'),
-    url: boundOneWay('navItem.url'),
-
-    errors: readOnly('navItem.errors'),
-
-    errorClass: computed('hasError', function () {
-        return this.hasError ? 'gh-blognav-item--error' : '';
-    }),
-
-    actions: {
-        addItem(item) {
-            this.addItem(item);
-        },
-
-        deleteItem(item) {
-            this.deleteItem(item);
-        },
-
-        updateUrl(value) {
-            return this.updateUrl(value, this.navItem);
-        },
-
-        updateLabel(value) {
-            this.set('label', value);
-            return this.updateLabel(value, this.navItem);
-        },
-
-        clearLabelErrors() {
-            this.get('navItem.errors').remove('label');
-        },
-
-        clearUrlErrors() {
-            this.get('navItem.errors').remove('url');
-        }
-    },
-
-    keyPress(event) {
-        // enter key
-        if (event.keyCode === 13 && this.get('navItem.isNew')) {
-            event.preventDefault();
-            run.scheduleOnce('actions', this, this.send, 'addItem', this.navItem);
-        }
-    }
-});
diff --git a/ghost/admin/app/components/settings/newsletters.hbs b/ghost/admin/app/components/settings/newsletters.hbs
deleted file mode 100644
index 7e8aee426b3..00000000000
--- a/ghost/admin/app/components/settings/newsletters.hbs
+++ /dev/null
@@ -1,145 +0,0 @@
-<section class="gh-main-section">
-    <div class="gh-expandable">
-        <div class="gh-expandable-block">
-            <div class="gh-expandable-header">
-                <div>
-                    <h4 class="gh-expandable-title">Enable newsletter sending</h4>
-                    <p class="gh-expandable-description">Newsletter features are active, posts can be sent by email</p>
-                </div>
-                <div class="for-switch">
-                    <label class="switch">
-                        <input
-                            type="checkbox"
-                            checked={{this.emailNewsletterEnabled}}
-                            class="gh-input"
-                            {{on "change" this.toggleEmailNewsletterEnabled}}
-                            name="email-newsletter-enabled"
-                            data-test-checkbox="email-newsletter-enabled"
-                        >
-                        <span class="input-toggle-component mt1"></span>
-                    </label>
-                </div>
-            </div>
-        </div>
-    </div>
-</section>
-
-{{#if this.emailNewsletterEnabled}}
-    <Settings::Newsletters::NewsletterManagement />
-
-    <section class="gh-main-section">
-        <h4 class="gh-main-section-header small bn">General settings</h4>
-        <div class="gh-expandable">
-            <div class="gh-expandable-block">
-                <div class="gh-expandable-header">
-                    <div>
-                        <h4 class="gh-expandable-title">Default newsletter recipients</h4>
-                        <p class="gh-expandable-description">When you publish new content, who do you usually want to send it to?</p>
-                    </div>
-                    <button type="button" class="gh-btn" {{on "click" (toggle-action "defaultRecipientsOpen" this)}} data-test-toggle-membersemail>
-                        <span>{{if this.defaultRecipientsOpen "Close" "Expand"}}</span>
-                    </button>
-                </div>
-                <div class="gh-expandable-content">
-                    {{#liquid-if this.defaultRecipientsOpen}}
-                        {{#if (gt this.activeNewsletterCount 1)}}
-                            <div class="form-group">
-                                <label class="fw6 f8">Default newsletter</label>
-                                <div class="gh-input"></div>
-                            </div>
-                            <div class="form-group">
-                                <label class="fw6 f8">Default member selection</label>
-                                <div class="gh-setting-richdd-container gh-setting-rich-dropdown">
-                                    <Settings::MembersEmail::DefaultRecipientsSelect
-                                        @recipients={{this.recipientsSelectValue}}
-                                        @segment={{this.settings.editorDefaultEmailRecipientsFilter}}
-                                        @onRecipientsChange={{this.setDefaultEmailRecipients}}
-                                        @onSegmentChange={{this.setDefaultEmailRecipientsFilter}}
-                                    />
-                                </div>
-                            </div>
-                        {{else}}
-                            <div class="gh-setting-richdd-container gh-setting-rich-dropdown form-group" data-test-select="default-recipients">
-                                <Settings::MembersEmail::DefaultRecipientsSelect
-                                    @recipients={{this.recipientsSelectValue}}
-                                    @segment={{this.settings.editorDefaultEmailRecipientsFilter}}
-                                    @onRecipientsChange={{this.setDefaultEmailRecipients}}
-                                    @onSegmentChange={{this.setDefaultEmailRecipientsFilter}}
-                                />
-                            </div>
-                        {{/if}}
-                    {{/liquid-if}}
-                </div>
-            </div>
-
-            {{#unless this.config.mailgunIsConfigured}}
-                <div class="gh-expandable-block">
-                    <div class="gh-expandable-header">
-                        <div>
-                            <h4 class="gh-expandable-title">Mailgun configuration</h4>
-                            <p class="gh-expandable-description">The Mailgun API is used for bulk email newsletter delivery. <a href="https://ghost.org/docs/faq/mailgun-newsletters/" target="_blank" rel="noopener noreferrer">Why is this required?</a></p>
-                        </div>
-                        <button type="button" class="gh-btn" {{on "click" (toggle-action "membersEmailOpen" this)}} data-test-toggle-membersemail>
-                            <span>{{if this.membersEmailOpen "Close" "Expand"}}</span>
-                        </button>
-                    </div>
-                    <div class="gh-expandable-content">
-                        {{#liquid-if this.membersEmailOpen}}
-                            <div class="flex flex-column flex">
-                                <GhFormGroup>
-                                    <div class="flex items-center">
-                                        <GhFormGroup class="gh-mailgun-region no-margin">
-                                            <label class="fw6 f8">Mailgun region</label>
-                                            <div class="mt1">
-                                                <PowerSelect
-                                                    @options={{this.mailgunRegions}}
-                                                    @selected={{this.mailgunRegion}}
-                                                    @onChange={{this.setMailgunRegion}}
-                                                    @class="gh-select"
-                                                    @searchEnabled={{false}}
-                                                    @triggerComponent={{component "gh-power-select/trigger"}}
-                                                    as |region|
-                                                >
-                                                    {{region.flag}} {{region.name}}
-                                                </PowerSelect>
-                                            </div>
-                                        </GhFormGroup>
-                                        <GhFormGroup class="no-margin">
-                                            <label class="fw6 f8" for="mailgun-domain">Mailgun domain</label>
-                                            <input
-                                                id="mailgun-domain"
-                                                type="text"
-                                                class="gh-input mt1"
-                                                value={{this.mailgunSettings.domain}}
-                                                {{on "input" this.setMailgunDomain}}
-                                                data-test-mailgun-domain-input
-                                            />
-                                        </GhFormGroup>
-                                    </div>
-                                    <p>Find your Mailgun region and domain
-                                        <a href="https://app.mailgun.com/app/sending/domains" target="_blank" class="fw5" rel="noopener noreferrer">here</a>
-                                    </p>
-                                </GhFormGroup>
-                                <GhFormGroup>
-                                    <label class="fw6 f8" for="mailgun-private-api">Mailgun Private API key</label>
-                                    <input
-                                        id="mailgun-private-api"
-                                        type="password"
-                                        value={{this.mailgunSettings.apiKey}}
-                                        {{on "input" this.setMailgunApiKey}}
-                                        class="gh-input mt1 password"
-                                        autocomplete="new-password"
-                                        data-test-mailgun-api-key-input
-                                    />
-                                    <p>Find your Mailgun API keys
-                                        <a href="https://app.mailgun.com/app/account/security/api_keys" target="_blank" class="fw5" rel="noopener noreferrer">here</a>
-                                    </p>
-                                </GhFormGroup>
-                            </div>
-                        {{/liquid-if}}
-                    </div>
-                </div>
-            {{/unless}}
-        </div>
-    </section>
-{{/if}}
diff --git a/ghost/admin/app/components/settings/newsletters.js b/ghost/admin/app/components/settings/newsletters.js
deleted file mode 100644
index fa2c3e0cbef..00000000000
--- a/ghost/admin/app/components/settings/newsletters.js
+++ /dev/null
@@ -1,157 +0,0 @@
-import Component from '@glimmer/component';
-import {action} from '@ember/object';
-import {inject} from 'ghost-admin/decorators/inject';
-import {inject as service} from '@ember/service';
-import {tracked} from '@glimmer/tracking';
-
-const US = {flag: '🇺🇸', name: 'US', baseUrl: 'https://api.mailgun.net/v3'};
-const EU = {flag: '🇪🇺', name: 'EU', baseUrl: 'https://api.eu.mailgun.net/v3'};
-
-export default class Newsletters extends Component {
-    @service settings;
-    @service feature;
-
-    @inject config;
-
-    // set recipientsSelectValue as a static property because within this
-    // component's lifecycle it's not always derived from the settings values.
-    // e.g. can be set to "segment" when the filter is empty which is not derivable
-    // from settings as it would equate to "none"
-    @tracked recipientsSelectValue = this._getDerivedRecipientsSelectValue();
-
-    mailgunRegions = [US, EU];
-
-    get emailNewsletterEnabled() {
-        return this.settings.editorDefaultEmailRecipients !== 'disabled';
-    }
-
-    get mailgunRegion() {
-        if (!this.settings.mailgunBaseUrl) {
-            return US;
-        }
-
-        return [US, EU].find((region) => {
-            return region.baseUrl === this.settings.mailgunBaseUrl;
-        });
-    }
-
-    get mailgunSettings() {
-        return {
-            apiKey: this.settings.mailgunApiKey || '',
-            domain: this.settings.mailgunDomain || '',
-            baseUrl: this.settings.mailgunBaseUrl || ''
-        };
-    }
-
-    @action
-    setMailgunDomain(event) {
-        this.settings.mailgunDomain = event.target.value;
-        if (!this.settings.mailgunBaseUrl) {
-            this.settings.mailgunBaseUrl = this.mailgunRegion.baseUrl;
-        }
-    }
-
-    @action
-    setMailgunApiKey(event) {
-        this.settings.mailgunApiKey = event.target.value;
-        if (!this.settings.mailgunBaseUrl) {
-            this.settings.mailgunBaseUrl = this.mailgunRegion.baseUrl;
-        }
-    }
-
-    @action
-    setMailgunRegion(region) {
-        this.settings.mailgunBaseUrl = region.baseUrl;
-    }
-
-    @action
-    toggleEmailTrackOpens(event) {
-        if (event) {
-            event.preventDefault();
-        }
-        this.settings.emailTrackOpens = !this.settings.emailTrackOpens;
-    }
-
-    @action
-    toggleEmailTrackClicks(event) {
-        if (event) {
-            event.preventDefault();
-        }
-        this.settings.emailTrackClicks = !this.settings.emailTrackClicks;
-    }
-
-    @action
-    toggleEmailNewsletterEnabled(event) {
-        if (event) {
-            event.preventDefault();
-        }
-
-        const newsletterEnabled = !this.emailNewsletterEnabled;
-
-        if (newsletterEnabled) {
-            this.settings.editorDefaultEmailRecipients = 'visibility';
-        } else {
-            this.settings.editorDefaultEmailRecipients = 'disabled';
-            this.settings.editorDefaultEmailRecipientsFilter = null;
-        }
-
-        this.recipientsSelectValue = this._getDerivedRecipientsSelectValue();
-
-        // Force a save when the toggle is changed
-        // this is required
-        // eslint-disable-next-line no-console
-        this.settings.save().catch(console.error);
-    }
-
-    @action
-    setDefaultEmailRecipients(value) {
-        // Update the underlying setting properties to match the selected recipients option
-
-        if (['visibility', 'disabled'].includes(value)) {
-            this.settings.editorDefaultEmailRecipients = value;
-            this.settings.editorDefaultEmailRecipientsFilter = null;
-        } else {
-            this.settings.editorDefaultEmailRecipients = 'filter';
-        }
-
-        if (value === 'all-members') {
-            this.settings.editorDefaultEmailRecipientsFilter = 'status:free,status:-free';
-        }
-
-        if (value === 'paid-only') {
-            this.settings.editorDefaultEmailRecipientsFilter = 'status:-free';
-        }
-
-        if (value === 'none') {
-            this.settings.editorDefaultEmailRecipientsFilter = null;
-        }
-
-        // Update the value used to display the selected recipients option explicitly
-        // because it's local non-derived state
-        this.recipientsSelectValue = value;
-    }
-
-    @action
-    setDefaultEmailRecipientsFilter(filter) {
-        this.settings.editorDefaultEmailRecipientsFilter = filter;
-    }
-
-    _getDerivedRecipientsSelectValue() {
-        const defaultEmailRecipients = this.settings.editorDefaultEmailRecipients;
-        const defaultEmailRecipientsFilter = this.settings.editorDefaultEmailRecipientsFilter;
-
-        if (defaultEmailRecipients === 'filter') {
-            if (defaultEmailRecipientsFilter === 'status:free,status:-free') {
-                return 'all-members';
-            } else if (defaultEmailRecipientsFilter === 'status:-free') {
-                return 'paid-only';
-            } else if (defaultEmailRecipientsFilter === null) {
-                return 'none';
-            } else {
-                return 'segment';
-            }
-        }
-
-        return defaultEmailRecipients;
-    }
-}
diff --git a/ghost/admin/app/components/settings/newsletters/newsletter-management.hbs b/ghost/admin/app/components/settings/newsletters/newsletter-management.hbs
deleted file mode 100644
index 66d7af7d9c2..00000000000
--- a/ghost/admin/app/components/settings/newsletters/newsletter-management.hbs
+++ /dev/null
@@ -1,127 +0,0 @@
-<div class="gh-main-section gh-newsletters">
-    <div class="flex justify-between items-center">
-        <h4 class="gh-main-section-header small bn">Newsletters</h4>
-        {{#if this.archivedNewsletters}}
-            <div>
-                <div data-test-dropdown="newsletter-status-filter">
-                    <PowerSelect
-                        @selected={{this.statusFilter}}
-                        @options={{this.statusFilters}}
-                        @searchEnabled={{false}}
-                        @onChange={{this.changeStatusFilter}}
-                        @triggerComponent={{component "gh-power-select/trigger"}}
-                        @triggerClass="gh-dropdown-archived ember-power-select-inline"
-                        @dropdownClass="gh-contentfilter-menu-dropdown"
-                        @horizontalPosition="right"
-                        @matchTriggerWidth={{false}}
-                        as |status|
-                    >
-                        {{titleize status}}
-                    </PowerSelect>
-                </div>
-            </div>
-        {{/if}}
-    </div>
-    <section class="gh-expandable">
-        <div class="gh-expandable-block">
-            {{#if this.loadNewslettersTask.isRunning}}
-                <div class="gh-main-content">... loading</div>
-            {{else}}
-                {{#unless this.displayingDefault}}
-                    {{#if (eq this.statusFilter "archived")}}
-                    <h4 class="gh-expandable-title">Archived newsletters</h4>
-                    <p class="gh-expandable-description">The newsletters below are no longer visible to members.</p>
-                    {{else}}
-                        <h4 class="gh-expandable-title">Active newsletters</h4>
-                        <p class="gh-expandable-description">Drag to set the order viewed by members on your site.</p>
-                    {{/if}}
-                {{/unless}}
-                <SortableObjects
-                    @sortableObjectList={{this.filteredNewsletters}}
-                    @useSwap={{false}}
-                    @sortEndAction={{perform this.reorderNewslettersTask}}
-                >
-                    {{#each this.filteredNewsletters as |newsletter|}}
-                        <DraggableObject
-                            class="gh-newsletter-card-container {{if (and (eq newsletter.status "active") (not this.displayingDefault)) "gh-newsletter-card-draggable"}} {{unless this.displayingDefault "multiple"}}"
-                            @content={{newsletter}}
-                            @dragHandle=".grab-newsletter"
-                            @isSortable={{true}}
-                        >
-                            {{svg-jar "grab" class="grab-newsletter"}}
-                            <div class="gh-main-content-card gh-newsletter-card" data-test-newsletter="{{newsletter.slug}}">
-                                {{#if this.displayingDefault}}
-                                    <div class="gh-newsletter-card-block title-block">
-                                        <h3 class="gh-newsletter-card-name">
-                                            {{newsletter.name}}
-                                        </h3>
-                                        <p class="gh-newsletter-card-description">
-                                            {{newsletter.description}}
-                                        </p>
-                                    </div>
-                                {{else}}
-                                    <LinkTo @route="settings.newsletters.edit-newsletter" @model={{newsletter.id}} class="gh-newsletter-card-block title-block">
-                                        <h3 class="gh-newsletter-card-name">
-                                            {{newsletter.name}}
-                                        </h3>
-                                        <p class="gh-newsletter-card-description">
-                                            {{newsletter.description}}
-                                        </p>
-                                    </LinkTo>
-                                {{/if}}
-                                <div class="gh-newsletter-card-block stats-block {{unless this.displayingDefault "multiple"}}">
-                                    <div>
-                                        <h3 class="gh-newsletter-card-name">{{format-number newsletter.count.active_members}}</h3>
-                                        <p class="gh-newsletter-card-description">Subscribers</p>
-                                    </div>
-                                    <div>
-                                        <h3 class="gh-newsletter-card-name">{{format-number newsletter.count.posts}}</h3>
-                                        <p class="gh-newsletter-card-description">Posts sent</p>
-                                    </div>
-                                </div>
-                                <div class="gh-newsletter-card-block cta-block">
-                                    {{#if this.displayingDefault}}
-                                        <LinkTo @route="settings.newsletters.edit-newsletter" @model={{newsletter.id}} class="gh-btn gh-btn-green" data-test-button="customize-newsletter"><span>Customize &rarr;</span></LinkTo>
-                                    {{else}}
-                                        <GhBasicDropdown @verticalPosition="below" @horizontalPosition="right" @renderInPlace={{true}} as |dd|>
-                                            <dd.Trigger class="gh-btn gh-btn-action-icon gh-btn-icon fill gh-btn-outline gh-tier-card-actions-button icon-only">
-                                                <span data-test-newsletter-menu-trigger>
-                                                    {{svg-jar "dotdotdot"}}
-                                                    <span class="hidden">Actions</span>
-                                                </span>
-                                            </dd.Trigger>
-                                            <dd.Content class="relative-dropdown-menu gh-newsletter-actions-menu">
-                                                <ul class="dropdown-menu dropdown-triangle-top-right" role="listbox" {{css-transition "anim-fade-in-scale"}}>
-                                                    <li>
-                                                        <LinkTo @route="settings.newsletters.edit-newsletter" @model={{newsletter.id}} class="mr2" data-test-button="customize-newsletter"><span>Edit</span></LinkTo>
-                                                    </li>
-                                                    {{#if (eq newsletter.status "active")}}
-                                                        <li>
-                                                            <button class="mr2" type="button" {{on "click" (fn this.archiveNewsletter newsletter)}} data-test-button="archive-newsletter">
-                                                                <span>Archive</span>
-                                                            </button>
-                                                        </li>
-                                                    {{/if}}
-                                                    {{#if (eq newsletter.status "archived")}}
-                                                        <li>
-                                                            <button class="mr2" type="button" {{on "click" (fn this.unarchiveNewsletter newsletter)}} data-test-button="reactivate-newsletter">
-                                                                <span>Reactivate</span>
-                                                            </button>
-                                                        </li>
-                                                    {{/if}}
-                                                </ul>
-                                            </dd.Content>
-                                        </GhBasicDropdown>
-                                    {{/if}}
-                                </div>
-                            </div>
-                        </DraggableObject>
-                    {{else}}
-                        <div class="gh-main-content">No newsletters found</div>
-                    {{/each}}
-                </SortableObjects>
-            {{/if}}
-        </div>
-    </section>
-    <LinkTo @route="settings.newsletters.new-newsletter" class="gh-add-newsletter" data-test-button="add-newsletter">{{svg-jar "plus"}}Add newsletter</LinkTo>
-</div>
diff --git a/ghost/admin/app/components/settings/newsletters/newsletter-management.js b/ghost/admin/app/components/settings/newsletters/newsletter-management.js
deleted file mode 100644
index 2396af38786..00000000000
--- a/ghost/admin/app/components/settings/newsletters/newsletter-management.js
+++ /dev/null
@@ -1,168 +0,0 @@
-import Component from '@glimmer/component';
-import ConfirmArchiveModal from '../../modals/newsletters/confirm-archive';
-import ConfirmUnarchiveModal from '../../modals/newsletters/confirm-unarchive';
-import MultipleNewslettersLimitModal from '../../modals/limits/multiple-newsletters';
-import {action} from '@ember/object';
-import {inject as service} from '@ember/service';
-import {task} from 'ember-concurrency';
-import {tracked} from '@glimmer/tracking';
-
-export default class NewsletterManagementComponent extends Component {
-    @service modals;
-    @service router;
-    @service store;
-    @service limit;
-
-    @tracked statusFilter = 'active';
-    @tracked filteredNewsletters = [];
-
-    statusFilters = ['active', 'archived'];
-    newsletters = this.store.peekAll('newsletter');
-
-    constructor() {
-        super(...arguments);
-        this.loadNewslettersTask.perform();
-
-        this.router.on('routeDidChange', this.handleNewRouteChange);
-    }
-
-    willDestroy() {
-        super.willDestroy(...arguments);
-        this.router.off('routeDidChange', this.handleNewRouteChange);
-
-        this.confirmArchiveModal?.close();
-        this.confirmUnarchiveModal?.close();
-    }
-
-    get activeNewsletters() {
-        return this.newsletters.filter(n => n.status === 'active');
-    }
-
-    get archivedNewsletters() {
-        return this.newsletters.filter(n => n.status === 'archived');
-    }
-
-    get displayingDefault() {
-        return this.statusFilter === 'active' && this.filteredNewsletters.length === 1;
-    }
-
-    @action
-    changeStatusFilter(status) {
-        this.statusFilter = status;
-        this.updateFilteredNewsletters();
-    }
-
-    @action
-    updateFilteredNewsletters() {
-        this.filteredNewsletters = this.newsletters.filter((n) => {
-            return n.status === this.statusFilter
-                && !n.isNew
-                && !n.isDestroyed;
-        });
-    }
-
-    @action
-    handleNewRouteChange(transition) {
-        // NOTE: this is necessary because ember-drag-drop has forced us into using
-        // an explicit tracked filteredNewsletters property rather than using a reactive
-        // getter that automatically displays newly added newsletters
-
-        if (transition.from.name === 'settings.newsletters.new-newsletter') {
-            this.updateFilteredNewsletters();
-        }
-    }
-
-    @action
-    archiveNewsletter(newsletter) {
-        this.confirmArchiveModal = this.modals.open(ConfirmArchiveModal, {
-            newsletter,
-            archiveNewsletterTask: this.archiveNewsletterTask
-        });
-    }
-
-    @task
-    *archiveNewsletterTask(newsletter) {
-        newsletter.status = 'archived';
-        const result = yield newsletter.save();
-
-        this.updateFilteredNewsletters();
-
-        this.confirmArchiveModal?.close();
-
-        return result;
-    }
-
-    @action
-    async unarchiveNewsletter(newsletter) {
-        try {
-            await this.limit.limiter.errorIfWouldGoOverLimit('newsletters');
-        } catch (error) {
-            if (error.errorType === 'HostLimitError') {
-                // Not allowed: we reached the limit here
-                this.modals.open(MultipleNewslettersLimitModal, {
-                    message: error.message
-                });
-                return;
-            }
-
-            throw error;
-        }
-
-        this.confirmUnarchiveModal = this.modals.open(ConfirmUnarchiveModal, {
-            newsletter,
-            unarchiveNewsletterTask: this.unarchiveNewsletterTask
-        });
-    }
-
-    @task
-    *unarchiveNewsletterTask(newsletter) {
-        newsletter.status = 'active';
-        const result = yield newsletter.save();
-
-        if (this.statusFilter === 'archived' && !this.archivedNewsletters.length) {
-            this.statusFilter = 'active';
-        }
-
-        this.updateFilteredNewsletters();
-
-        this.confirmUnarchiveModal?.close();
-
-        return result;
-    }
-
-    @task
-    *loadNewslettersTask() {
-        const newsletters = yield this.store.query('newsletter', {include: 'count.active_members,count.posts', limit: 'all'});
-
-        this.updateFilteredNewsletters();
-
-        return newsletters;
-    }
-
-    @task
-    *reorderNewslettersTask() {
-        // filteredNewsletters is the array that gets updated by <SortableObjects> whilst dragging.
-        // we only want to update ordering when _active_ newsletters are re-ordered to make sure
-        // archived newsletters don't end up with a lower sort order than active ones
-
-        if (this.statusFilter !== 'active') {
-            return;
-        }
-
-        // use filteredNewsletters rather than activeNewsletters so we're using'the ordered array
-        const activeNewsletters = this.filteredNewsletters;
-
-        const otherNewsletters = this.newsletters
-            .filter(n => !activeNewsletters.includes(n))
-            .sort(({sortOrder: a}, {sortOrder: b}) => b - a);
-
-        let sortOrder = 0;
-
-        for (const n of [...activeNewsletters, ...otherNewsletters]) {
-            n.sortOrder = sortOrder;
-            yield n.save();
-
-            sortOrder += 1;
-        }
-    }
-}
diff --git a/ghost/admin/app/components/settings/signup-form-embed.hbs b/ghost/admin/app/components/settings/signup-form-embed.hbs
deleted file mode 100644
index b556124d885..00000000000
--- a/ghost/admin/app/components/settings/signup-form-embed.hbs
+++ /dev/null
@@ -1,12 +0,0 @@
-
-<div class="gh-expandable-block">
-    <div class="gh-expandable-header">
-        <div>
-            <h4 class="gh-expandable-title">Embeddable signup form</h4>
-            <p class="gh-expandable-description">Grow your audience from anywhere on the web</p>
-        </div>
-        <button type="button" class="gh-btn" {{on "click" this.open}} disabled={{not (eq this.settings.membersSignupAccess "all")}}>
-            <span>Embed</span>
-        </button>
-    </div>
-</div>
\ No newline at end of file
diff --git a/ghost/admin/app/components/settings/signup-form-embed.js b/ghost/admin/app/components/settings/signup-form-embed.js
deleted file mode 100644
index e04f827e01c..00000000000
--- a/ghost/admin/app/components/settings/signup-form-embed.js
+++ /dev/null
@@ -1,14 +0,0 @@
-import Component from '@glimmer/component';
-import SignupFormEmbedModal from '../../components/modals/settings/signup-form-embed';
-import {action} from '@ember/object';
-import {inject as service} from '@ember/service';
-
-export default class SignupFormEmbed extends Component {
-    @service modals;
-    @service settings;
-
-    @action
-    open() {
-        this.modals.open(SignupFormEmbedModal, {}, {});
-    }
-}
diff --git a/ghost/admin/app/components/settings/signup-form/preview.hbs b/ghost/admin/app/components/settings/signup-form/preview.hbs
deleted file mode 100644
index 80853e7b13e..00000000000
--- a/ghost/admin/app/components/settings/signup-form/preview.hbs
+++ /dev/null
@@ -1,19 +0,0 @@
-<div {{did-update this.onChangeHtml @html}} class={{if this.increaseWidth "gh-iframe-increase-width"}}>
-    <iframe
-        srcDoc="<!DOCTYPE html>"
-        class={{concat "gh-signup-form-iframe" (unless (eq this.visibleIframeIndex 0) " gh-iframe-hidden") " gh-style-" this.firstIframeStyle}}
-        frameborder="0"
-        allowtransparency="true"
-        title="Signup Form Preview 1"
-        {{on "load" (fn this.onLoad 0) }}
-    ></iframe>
-
-    <iframe
-        srcDoc="<!DOCTYPE html>"
-        class={{concat "gh-signup-form-iframe" (unless (eq this.visibleIframeIndex 1) " gh-iframe-hidden") " gh-style-" this.secondIframeStyle}}
-        frameborder="0"
-        allowtransparency="true"
-        title="Signup Form Preview 2"
-        {{on "load" (fn this.onLoad 1)}}
-    ></iframe>
-</div>
diff --git a/ghost/admin/app/components/settings/signup-form/preview.js b/ghost/admin/app/components/settings/signup-form/preview.js
deleted file mode 100644
index 8fd7d0caf61..00000000000
--- a/ghost/admin/app/components/settings/signup-form/preview.js
+++ /dev/null
@@ -1,134 +0,0 @@
-import Component from '@glimmer/component';
-import {action} from '@ember/object';
-import {throttle} from '@ember/runloop';
-import {tracked} from '@glimmer/tracking';
-
-export default class Preview extends Component {
-    // We have two iframes
-    // When the HTML changes, the invisible iframe will get changed, once that one is fully loaded, it will become visible and the other iframe will be hidden
-
-    @tracked
-        iframes = [
-            {element: null, html: '', loading: false, style: ''},
-            {element: null, html: '', loading: false, style: ''}
-        ];
-
-    @tracked
-        visibleIframeIndex = 0;
-
-    lastChange = new Date();
-
-    get visibleHtml() {
-        return this.iframes[this.visibleIframeIndex].html;
-    }
-
-    get firstIframeStyle() {
-        return this.iframes[0].style;
-    }
-
-    get secondIframeStyle() {
-        return this.iframes[1].style;
-    }
-
-    @action
-    onLoad(index, event) {
-        const iframe = this.iframes[index];
-        if (!iframe) {
-            return;
-        }
-
-        if (iframe.timer) {
-            clearTimeout(iframe.timer);
-            iframe.timer = null;
-        }
-
-        if (!iframe.element) {
-            iframe.element = event.currentTarget;
-
-            if (index === this.visibleIframeIndex) {
-                setTimeout(() => {
-                    this.updateContent(index);
-                });
-            }
-        } else {
-            if (!iframe.loading) {
-                return;
-            }
-            // We need to wait until the iframe is fully rendered. The onLoad is kinda okay in Chrome, but on Safari it is fired too early
-            // So we need to poll if needed
-            // Check if this iframe element has an iframe inside of the body
-            // If so, we need to wait for that iframe to load as well
-            const iframeElement = iframe.element.contentWindow.document.querySelector('iframe');
-
-            // Check that iframe contains a non empty body
-            const hasChildren = iframeElement && iframeElement.contentWindow.document.body && iframeElement.contentWindow.document.body.children.length > 0;
-
-            if (hasChildren) {
-                // Finished loading this iframe
-                this.visibleIframeIndex = index;
-
-                // Force tracked update
-                this.iframes = [...this.iframes];
-                iframe.loading = false;
-            } else {
-                // Wait 50ms
-                iframe.timer = setTimeout(() => {
-                    this.onLoad(index, event);
-                }, 50);
-            }
-        }
-    }
-
-    @action onChangeHtml() {
-        // Check if no loading iframes
-        if (!this.iframes[0].loading && !this.iframes[1].loading && this.lastChange < new Date() - 500) {
-            // We make it feel more responsive by updating the frame immediately, but only if the last change was more than 500ms ago
-            // otherwise we get a lot of flickering
-
-            this.lastChange = new Date();
-            this.throttledUpdate();
-            return;
-        }
-
-        // Only update the iframe after 400ms, with 400ms in between
-        this.lastChange = new Date();
-        throttle(this, this.throttledUpdate, 400, false);
-    }
-
-    throttledUpdate() {
-        const currentVisibleHtml = this.iframes[this.visibleIframeIndex].html;
-        if (currentVisibleHtml === this.args.html) {
-            return;
-        }
-
-        // Update the invisible iframe content
-        const index = this.visibleIframeIndex === 0 ? 1 : 0;
-        this.updateContent(index);
-    }
-
-    @action
-    updateContent(index) {
-        const iframe = this.iframes[index];
-        if (!iframe || !iframe.element) {
-            return;
-        }
-
-        if (iframe.timer) {
-            clearTimeout(iframe.timer);
-            iframe.timer = null;
-        }
-
-        iframe.loading = true;
-        const html = `<html><head><style>body, html {padding: 0; margin: 0; overflow: hidden;}</style></head><body>${this.args.html}</body></html>`;
-        iframe.html = this.args.html;
-        iframe.style = this.args.style;
-
-        // Set the iframe's new HTML
-        iframe.element.contentWindow.document.open();
-        iframe.element.contentWindow.document.write(html);
-        iframe.element.contentWindow.document.close();
-
-        // Force tracked update
-        this.iframes = [...this.iframes];
-    }
-}
diff --git a/ghost/admin/app/components/settings/signup-form/style-select.hbs b/ghost/admin/app/components/settings/signup-form/style-select.hbs
deleted file mode 100644
index 69c57b53878..00000000000
--- a/ghost/admin/app/components/settings/signup-form/style-select.hbs
+++ /dev/null
@@ -1,5 +0,0 @@
-<div class="gh-btn-group">
-    {{#each this.options as |option|}}
-        <button class="gh-btn {{if (eq this.selectedOption.value option.value) "gh-btn-group-selected"}}" type="button" {{on "click" (fn this.setRecipients option)}}><span>{{option.name}}</span></button>
-    {{/each}}
-</div>
diff --git a/ghost/admin/app/components/settings/signup-form/style-select.js b/ghost/admin/app/components/settings/signup-form/style-select.js
deleted file mode 100644
index 052973743b7..00000000000
--- a/ghost/admin/app/components/settings/signup-form/style-select.js
+++ /dev/null
@@ -1,28 +0,0 @@
-import Component from '@glimmer/component';
-import {action} from '@ember/object';
-
-export default class StyleSelect extends Component {
-    get options() {
-        return [{
-            name: 'Branded',
-            value: 'all-in-one'
-        }, {
-            name: 'Minimal',
-            value: 'minimal'
-        }];
-    }
-
-    get selectedOption() {
-        return this.options.find(o => o.value === this.args.value);
-    }
-
-    @action
-    setRecipients(option) {
-        this.args.onChange(option.value);
-    }
-
-    @action
-    changeOption(option) {
-        this.option = option;
-    }
-}
diff --git a/ghost/admin/app/components/settings/staff/modals/delete-user.hbs b/ghost/admin/app/components/settings/staff/modals/delete-user.hbs
deleted file mode 100644
index 758650c24ae..00000000000
--- a/ghost/admin/app/components/settings/staff/modals/delete-user.hbs
+++ /dev/null
@@ -1,34 +0,0 @@
-<div class="modal-content" data-test-modal="delete-user">
-    <header class="modal-header">
-        <h1>Are you sure you want to delete this user?</h1>
-    </header>
-    <button type="button" class="close" title="Close" {{on "click" @close}}>{{svg-jar "close"}}<span class="hidden">Close</span></button>
-
-    <div class="modal-body">
-        {{#if @data.user.count.posts}}
-            <p>
-                <strong>{{@data.user.name}}</strong> will be permanently deleted and their <strong data-test-text="user-post-count">{{gh-pluralize @data.user.count.posts 'post'}}</strong> will be automatically assigned to <strong>{{this.ownerUser.name}}</strong>.
-            </p>
-
-            <p class="gh-transfer-tag">
-                To make these easy to find in the future, each post will be given an internal tag of <strong>#{{@data.user.slug}}</strong>
-            </p>
-        {{else}}
-            <p>
-                <strong>{{@data.user.name}}</strong> will be permanently deleted.
-            </p>
-        {{/if}}
-    </div>
-
-    <div class="modal-footer">
-        <button class="gh-btn" data-test-button="cancel-delete-user" type="button" {{on "click" @close}}>
-            <span>Cancel</span>
-        </button>
-        <GhTaskButton
-            @buttonText="Delete user"
-            @successText="Deleted"
-            @task={{this.deleteUserTask}}
-            @class="gh-btn gh-btn-red gh-btn-icon"
-            data-test-button="confirm-delete-user" />
-    </div>
-</div>
\ No newline at end of file
diff --git a/ghost/admin/app/components/settings/staff/modals/delete-user.js b/ghost/admin/app/components/settings/staff/modals/delete-user.js
deleted file mode 100644
index 83eadf104d1..00000000000
--- a/ghost/admin/app/components/settings/staff/modals/delete-user.js
+++ /dev/null
@@ -1,31 +0,0 @@
-import Component from '@glimmer/component';
-import {inject as service} from '@ember/service';
-import {task} from 'ember-concurrency';
-
-export default class DeleteUserModal extends Component {
-    @service notifications;
-    @service router;
-    @service store;
-
-    get ownerUser() {
-        return this.store.peekAll('user').findBy('isOwnerOnly', true);
-    }
-
-    @task({drop: true})
-    *deleteUserTask() {
-        try {
-            const {user} = this.args.data;
-
-            yield user.destroyRecord();
-
-            this.notifications.closeAlerts('user.delete');
-            this.store.unloadAll('post');
-            this.router.transitionTo('settings.staff');
-        } catch (error) {
-            this.notifications.showAlert('The user could not be deleted. Please try again.', {type: 'error', key: 'user.delete.failed'});
-            throw error;
-        } finally {
-            this.args.close();
-        }
-    }
-}
diff --git a/ghost/admin/app/components/settings/staff/modals/regenerate-staff-token.hbs b/ghost/admin/app/components/settings/staff/modals/regenerate-staff-token.hbs
deleted file mode 100644
index 4f811b38521..00000000000
--- a/ghost/admin/app/components/settings/staff/modals/regenerate-staff-token.hbs
+++ /dev/null
@@ -1,22 +0,0 @@
-<div class="modal-content" data-test-modal="regenerate-staff-token">
-    <header class="modal-header">
-        <h1>Regenerate your Staff Access Token</h1>
-    </header>
-    <button type="button" class="close" title="Close" {{on "click" @close}}>{{svg-jar "close"}}<span class="hidden">Close</span></button>
-
-    <div class="modal-body">
-        <p>
-            You can regenerate your Staff Access Token any time, but any scripts or applications using it will need to be updated.
-        </p>
-        {{#if this.errorMessage}}
-            <p class='red'> {{this.errorMessage}}</p>
-        {{/if}}
-    </div>
-
-    <div class="modal-footer">
-        <button class="gh-btn" type="button" {{on "click" @close}}><span>Cancel</span></button>
-        <button class="gh-btn gh-btn-icon gh-btn-red" type="button" {{on "click" this.regenerateStaffToken}}>
-            <span>Regenerate your Staff Access Token</span>
-        </button>
-    </div>
-</div>
\ No newline at end of file
diff --git a/ghost/admin/app/components/settings/staff/modals/regenerate-staff-token.js b/ghost/admin/app/components/settings/staff/modals/regenerate-staff-token.js
deleted file mode 100644
index 82700ff2be3..00000000000
--- a/ghost/admin/app/components/settings/staff/modals/regenerate-staff-token.js
+++ /dev/null
@@ -1,23 +0,0 @@
-import Component from '@glimmer/component';
-import {action} from '@ember/object';
-import {inject as service} from '@ember/service';
-
-export default class RegenerateStaffTokenModal extends Component {
-    @service ajax;
-    @service ghostPaths;
-    @service notifications;
-
-    @action
-    async regenerateStaffToken() {
-        const url = this.ghostPaths.url.api('users', 'me', 'token');
-
-        try {
-            const {apiKey} = await this.ajax.put(url, {data: {}});
-
-            this.args.close(`${apiKey.id}:${apiKey.secret}`);
-        } catch (error) {
-            this.notifications.showAPIError(error, {key: 'token.regenerate'});
-            this.args.close();
-        }
-    }
-}
diff --git a/ghost/admin/app/components/settings/staff/modals/select-role.hbs b/ghost/admin/app/components/settings/staff/modals/select-role.hbs
deleted file mode 100644
index faca0d3f23a..00000000000
--- a/ghost/admin/app/components/settings/staff/modals/select-role.hbs
+++ /dev/null
@@ -1,18 +0,0 @@
-<div class="modal-content" data-test-modal="select-role">
-    <header class="modal-header">
-        <h1>Change user role</h1>
-    </header>
-    <button type="button" class="close" title="Close" {{on "click" @close}}>{{svg-jar "close"}}<span class="hidden">Close</span></button>
-
-    <div class="modal-body">
-        <GhRoleSelection
-            @selected={{this.role}}
-            @setRole={{fn (mut this.role)}}
-        />
-    </div>
-
-    <div class="modal-footer">
-        <button class="gh-btn" type="button" {{on "click" @close}}><span>Cancel</span></button>
-        <button class="gh-btn gh-btn-black" type="button" {{on "click" (fn @close this.role)}}><span>Change role</span></button>
-    </div>
-</div>
\ No newline at end of file
diff --git a/ghost/admin/app/components/settings/staff/modals/select-role.js b/ghost/admin/app/components/settings/staff/modals/select-role.js
deleted file mode 100644
index c38f44b3f2d..00000000000
--- a/ghost/admin/app/components/settings/staff/modals/select-role.js
+++ /dev/null
@@ -1,11 +0,0 @@
-import Component from '@glimmer/component';
-import {tracked} from '@glimmer/tracking';
-
-export default class SelectRoleModal extends Component {
-    @tracked role;
-
-    constructor() {
-        super(...arguments);
-        this.role = this.args.data.currentRole;
-    }
-}
diff --git a/ghost/admin/app/components/settings/staff/modals/suspend-user.hbs b/ghost/admin/app/components/settings/staff/modals/suspend-user.hbs
deleted file mode 100644
index 2208023bbf3..00000000000
--- a/ghost/admin/app/components/settings/staff/modals/suspend-user.hbs
+++ /dev/null
@@ -1,21 +0,0 @@
-<div class="modal-content">
-    <header class="modal-header">
-        <h1>Are you sure you want to suspend this user?</h1>
-    </header>
-    <button type="button" class="close" title="Close" {{on "click" @close}}>{{svg-jar "close"}}<span class="hidden">Close</span></button>
-
-    <div class="modal-body">
-        <strong>WARNING:</strong> This user will no longer be able to log in but their posts will be kept.
-    </div>
-
-    <div class="modal-footer">
-        <button class="gh-btn" type="button" {{on "click" @close}}><span>Cancel</span></button>
-        <GhTaskButton
-            @buttonText="Suspend"
-            @successText="Suspended"
-            @task={{this.suspendUserTask}}
-            @class="gh-btn gh-btn-red gh-btn-icon"
-            data-test-modal-confirm="true"
-        />
-    </div>
-</div>
\ No newline at end of file
diff --git a/ghost/admin/app/components/settings/staff/modals/suspend-user.js b/ghost/admin/app/components/settings/staff/modals/suspend-user.js
deleted file mode 100644
index 65ea2c6ce52..00000000000
--- a/ghost/admin/app/components/settings/staff/modals/suspend-user.js
+++ /dev/null
@@ -1,24 +0,0 @@
-import Component from '@glimmer/component';
-import {inject as service} from '@ember/service';
-import {task} from 'ember-concurrency';
-
-export default class SuspendUserModal extends Component {
-    @service notifications;
-
-    @task({drop: true})
-    *suspendUserTask() {
-        try {
-            const {user, saveTask} = this.args.data;
-
-            user.status = 'inactive';
-            yield saveTask.perform();
-
-            this.notifications.closeAlerts('user.suspend');
-        } catch (error) {
-            this.notifications.showAlert('The user could not be suspended. Please try again.', {type: 'error', key: 'user.suspend.failed'});
-            throw error;
-        } finally {
-            this.args.close();
-        }
-    }
-}
diff --git a/ghost/admin/app/components/settings/staff/modals/transfer-ownership.hbs b/ghost/admin/app/components/settings/staff/modals/transfer-ownership.hbs
deleted file mode 100644
index 32bb26259db..00000000000
--- a/ghost/admin/app/components/settings/staff/modals/transfer-ownership.hbs
+++ /dev/null
@@ -1,22 +0,0 @@
-<div class="modal-content" data-test-modal="transfer-owner">
-    <header class="modal-header">
-        <h1>Transfer Ownership</h1>
-    </header>
-    <button type="button" class="close" title="Close" {{on "click" @close}}>{{svg-jar "close"}}<span class="hidden">Close</span></button>
-
-    <div class="modal-body">
-        <p>
-            Are you sure you want to transfer the ownership of this blog?
-            You will not be able to undo this action.
-        </p>
-    </div>
-
-    <div class="modal-footer">
-        <button class="gh-btn" type="button" {{on "click" @close}}><span>Cancel</span></button>
-        <GhTaskButton
-            @buttonText="Yep - I'm sure"
-            @task={{this.transferOwnershipTask}}
-            @class="gh-btn gh-btn-red gh-btn-icon"
-        />
-    </div>
-</div>
\ No newline at end of file
diff --git a/ghost/admin/app/components/settings/staff/modals/transfer-ownership.js b/ghost/admin/app/components/settings/staff/modals/transfer-ownership.js
deleted file mode 100644
index 6caf44ea718..00000000000
--- a/ghost/admin/app/components/settings/staff/modals/transfer-ownership.js
+++ /dev/null
@@ -1,48 +0,0 @@
-import Component from '@glimmer/component';
-import {isArray} from '@ember/array';
-import {inject as service} from '@ember/service';
-import {task} from 'ember-concurrency';
-
-export default class TransferOwnershipModal extends Component {
-    @service ajax;
-    @service dropdown;
-    @service ghostPaths;
-    @service notifications;
-    @service store;
-
-    @task({drop: true})
-    *transferOwnershipTask() {
-        try {
-            this.dropdown.closeDropdowns();
-
-            const {user} = this.args.data;
-            const url = this.ghostPaths.url.api('users', 'owner');
-
-            const response = yield this.ajax.put(url, {
-                data: {
-                    owner: [{
-                        id: user.id
-                    }]
-                }
-            });
-
-            // manually update the roles for the users that just changed roles
-            // because store.pushPayload is not working with embedded relations
-            if (isArray(response?.users)) {
-                response.users.forEach((userJSON) => {
-                    const updatedUser = this.store.peekRecord('user', userJSON.id);
-                    const role = this.store.peekRecord('role', userJSON.roles[0].id);
-
-                    updatedUser.role = role;
-                });
-            }
-
-            this.notifications.showAlert(`Ownership successfully transferred to ${user.get('name')}`, {type: 'success', key: 'owner.transfer.success'});
-        } catch (error) {
-            this.notifications.showAPIError(error, {key: 'owner.transfer'});
-            throw error;
-        } finally {
-            this.args.close();
-        }
-    }
-}
diff --git a/ghost/admin/app/components/settings/staff/modals/unsuspend-user.hbs b/ghost/admin/app/components/settings/staff/modals/unsuspend-user.hbs
deleted file mode 100644
index 0cedd25509e..00000000000
--- a/ghost/admin/app/components/settings/staff/modals/unsuspend-user.hbs
+++ /dev/null
@@ -1,46 +0,0 @@
-{{#if this.hostLimitError}}
-    <div class="modal-content" data-test-modal="upgrade-unsuspend-user-host-limit">
-        <header class="modal-header">
-            <h1>Upgrade to un-suspend this user</h1>
-        </header>
-        <button class="close" title="Close" type="button" {{on "click" @close}}>{{svg-jar "close"}}<span class="hidden">Close</span></button>
-
-        <div class="modal-body">
-            <p>
-                {{html-safe this.hostLimitError}} To give this user access to Ghost, upgrade to a different plan.
-            </p>
-        </div>
-
-        <div class="modal-footer">
-            <button class="gh-btn" data-test-button="cancel-upgrade" type="button" {{on "click" @close}}>
-                <span>Cancel</span>
-            </button>
-
-            <button class="gh-btn gh-btn-green" data-test-button="upgrade-plan" type="button" {{on "click" this.upgrade}}>
-                <span>Upgrade my plan</span>
-            </button>
-        </div>
-    </div>
-{{else}}
-    <div class="modal-content" data-test-modal="unsuspend-user">
-        <header class="modal-header">
-            <h1>Are you sure you want to un-suspend this user?</h1>
-        </header>
-        <button type="button" class="close" title="Close" {{on "click" @close}}>{{svg-jar "close"}}<span class="hidden">Close</span></button>
-
-        <div class="modal-body">
-            <strong>WARNING:</strong> This user will be able to log in again and will have the same permissions they had previously.
-        </div>
-
-        <div class="modal-footer">
-            <button class="gh-btn" type="button" {{on "click" @close}}><span>Cancel</span></button>
-            <GhTaskButton
-                @buttonText="Un-suspend"
-                @successText="Suspended"
-                @task={{this.unsuspendUserTask}}
-                @class="gh-btn gh-btn-red gh-btn-icon"
-                data-test-modal-confirm="true"
-            />
-        </div>
-    </div>
-{{/if}}
\ No newline at end of file
diff --git a/ghost/admin/app/components/settings/staff/modals/unsuspend-user.js b/ghost/admin/app/components/settings/staff/modals/unsuspend-user.js
deleted file mode 100644
index b654e4ce2a5..00000000000
--- a/ghost/admin/app/components/settings/staff/modals/unsuspend-user.js
+++ /dev/null
@@ -1,57 +0,0 @@
-import Component from '@glimmer/component';
-import {action} from '@ember/object';
-import {inject as service} from '@ember/service';
-import {task} from 'ember-concurrency';
-import {tracked} from '@glimmer/tracking';
-
-export default class UnsuspendUserModal extends Component {
-    @service limit;
-    @service notifications;
-    @service router;
-
-    @tracked hostLimitError = null;
-
-    constructor() {
-        super(...arguments);
-        this.checkHostLimitsTask.perform();
-    }
-
-    @action
-    upgrade() {
-        this.router.transitionTo('pro');
-        this.args.close();
-    }
-
-    @task
-    *checkHostLimitsTask() {
-        if (this.args.data.user.role.name !== 'Contributor' && this.limit.limiter.isLimited('staff')) {
-            try {
-                yield this.limit.limiter.errorIfWouldGoOverLimit('staff');
-            } catch (error) {
-                if (error.errorType === 'HostLimitError') {
-                    this.hostLimitError = error.message;
-                } else {
-                    this.notifications.showAPIError(error, {key: 'staff.limit'});
-                    this.args.close();
-                }
-            }
-        }
-    }
-
-    @task({drop: true})
-    *unsuspendUserTask() {
-        try {
-            const {user, saveTask} = this.args.data;
-
-            user.status = 'active';
-            yield saveTask.perform();
-
-            this.notifications.closeAlerts('user.unsuspend');
-        } catch (error) {
-            this.notifications.showAlert('The user could not be unsuspended. Please try again.', {type: 'error', key: 'user.unsuspend.failed'});
-            throw error;
-        } finally {
-            this.args.close();
-        }
-    }
-}
diff --git a/ghost/admin/app/components/settings/staff/modals/upload-image.hbs b/ghost/admin/app/components/settings/staff/modals/upload-image.hbs
deleted file mode 100644
index 3f01713a0a8..00000000000
--- a/ghost/admin/app/components/settings/staff/modals/upload-image.hbs
+++ /dev/null
@@ -1,42 +0,0 @@
-<div class="modal-content" data-test-modal="upload-image">
-    <div class="modal-body">
-        {{#if this.url}}
-            <div class="gh-image-uploader -with-image">
-                <div><img src={{this.url}} alt="" role="presentation"></div>
-                <KoenigImageEditor
-                    @imageSrc={{this.url}}
-                    @saveUrl={{this.fileUploaded}}
-                />
-                <button type="button" class="image-action image-delete" title="Delete" {{on "click" this.removeImage}}>
-                    {{svg-jar "trash"}}
-                    <span class="hidden">Delete</span>
-                </button>
-            </div>
-        {{else}}
-            <GhImageUploader
-                @image={{this.url}}
-                @saveButton={{false}}
-                @update={{this.fileUploaded}}
-                @uploadStarted={{fn (mut this.isUploading) true}}
-                @uploadFinished={{fn (mut this.isUploading) false}}
-                @accept={{@data.accept}}
-                @extensions={{@data.extensions}}
-                @uploadUrl={{@data.uploadUrl}}
-                @paramsHash={{@data.paramsHas}}
-            />
-        {{/if}}
-    </div>
-
-    <div class="modal-footer">
-        <button class="gh-btn" type="button" {{on "click" @close}}><span>Cancel</span></button>
-        {{#if this.isUploading}}
-            <button class="gh-btn gh-btn-black right gh-btn-icon disabled" type="button"><span>Save</span></button>
-        {{else}}
-            <GhTaskButton
-                @task={{this.uploadImageTask}}
-                @class="gh-btn gh-btn-black right gh-btn-icon"
-                data-test-modal-accept-button
-            />
-        {{/if}}
-    </div>
-</div>
\ No newline at end of file
diff --git a/ghost/admin/app/components/settings/staff/modals/upload-image.js b/ghost/admin/app/components/settings/staff/modals/upload-image.js
deleted file mode 100644
index 345064967df..00000000000
--- a/ghost/admin/app/components/settings/staff/modals/upload-image.js
+++ /dev/null
@@ -1,52 +0,0 @@
-import Component from '@glimmer/component';
-import {action} from '@ember/object';
-import {inject as service} from '@ember/service';
-import {task} from 'ember-concurrency';
-import {tracked} from '@glimmer/tracking';
-
-export default class UploadImageModal extends Component {
-    @service notifications;
-
-    @tracked errorMessage;
-    @tracked isUploading = false;
-    @tracked url = '';
-
-    constructor() {
-        super(...arguments);
-        this.url = this._getModelProperty();
-    }
-
-    @action
-    fileUploaded(url) {
-        this.url = url;
-    }
-
-    @action
-    removeImage() {
-        this.url = '';
-    }
-
-    @task({drop: true})
-    *uploadImageTask() {
-        this._setModelProperty(this.url);
-
-        try {
-            yield this.args.data.model.save();
-        } catch (e) {
-            this.notifications.showAPIError(e, {key: 'image.upload'});
-        } finally {
-            this.args.close();
-        }
-    }
-
-    _getModelProperty() {
-        const {model, modelProperty} = this.args.data;
-        return model[modelProperty];
-    }
-
-    _setModelProperty(url) {
-        const {model, modelProperty} = this.args.data;
-        model[modelProperty] = url;
-        return url;
-    }
-}
diff --git a/ghost/admin/app/components/settings/tips-and-donations.hbs b/ghost/admin/app/components/settings/tips-and-donations.hbs
deleted file mode 100644
index 192cce81bc2..00000000000
--- a/ghost/admin/app/components/settings/tips-and-donations.hbs
+++ /dev/null
@@ -1,112 +0,0 @@
-<div class="gh-expandable-block">
-    <div class="gh-expandable-header">
-        <div>
-            <h4 class="gh-expandable-title">Tips or donations</h4>
-            {{#if (feature "tipsAndDonations")}}
-                <p class="gh-expandable-description">Give your audience a one-time way to support your work, no membership required.
-                    {{#if this.membersUtils.isStripeEnabled}}
-                    {{else}}
-                        <button type="button" {{on "click" this.openStripeConnect}} class="gh-stripe-connect-link">Connect with Stripe</button>
-                    {{/if}}
-                </p>
-            {{else}}
-                <p class="gh-expandable-description">Give your audience a one-time way to support your work, no membership required</p>
-            {{/if}}
-        </div>
-        {{#if (feature "tipsAndDonations")}}
-            {{#if this.membersUtils.isStripeEnabled}}
-                <button type="button" class="gh-btn" {{on "click" (toggle-action "tipsAndDonationsOpen" this)}} data-testid="expand-tips-and-donations">
-                    <span>{{if this.tipsAndDonationsOpen "Close" "Expand"}}</span>
-                </button>
-            {{else}}
-                <button type="button" class="gh-btn" disabled={{true}} {{on "click" (toggle-action "tipsAndDonationsOpen" this)}}>
-                    <span>{{if this.tipsAndDonationsOpen "Close" "Expand"}}</span>
-                </button>
-            {{/if}}
-        {{else}}
-            {{#if this.membersUtils.isStripeEnabled}}
-                <button type="button" class="gh-btn" {{on "click" (toggle-action "tipsAndDonationsOpen" this)}}>
-                    <span>{{if this.tipsAndDonationsOpen "Close" "Expand"}}</span>
-                </button>
-            {{else}}
-                <button type="button" class="stripe-connect {{if (or (not this.session.user.isAdmin) this.isConnectDisallowed) "disabled"}}" {{on "click" this.openStripeConnect}}>
-                    <span></span>
-                </button>
-            {{/if}}
-        {{/if}}
-    </div>
-    <div class="gh-expandable-content">
-        {{#liquid-if (and this.tipsAndDonationsOpen this.membersUtils.isStripeEnabled) }}
-        <div class="gh-setting-content-extended">
-            <GhFormGroup>
-                <div class="flex items-center">
-                    <div class="gh-tips-and-donations-suggested-amount">
-                        <label for="tips-and-donations-amount" class="fw6 mb1">Suggest an amount</label>
-                        <div class="flex flex-row items-start">
-                            <GhFormGroup class="no-margin">
-                                <div class="percentage">
-                                    <input
-                                        type="number"
-                                        id="gh-tips-and-donations-amount"
-                                        data-testid="tips-and-donations-amount"
-                                        class="gh-input"
-                                        name="amount"
-                                        min="0"
-                                        value={{this.selectedAmount}}
-                                        {{on "input" this.setDonationsSuggestedAmount}}
-                                    />
-                                </div>
-                            </GhFormGroup>
-                            <div class="gh-tips-and-donations-currency">
-                                <GhFormGroup class="no-margin">
-                                    <span class="gh-select">
-                                        <OneWaySelect
-                                            @value={{this.selectedCurrency}}
-                                            id="gh-tips-and-donations-currency"
-                                            name="currency"
-                                            @options={{readonly this.allCurrencies}}
-                                            @optionValuePath="value"
-                                            @optionLabelPath="label"
-                                            @update={{this.setDonationsCurrency}}
-                                        />
-                                        {{svg-jar "arrow-down-small"}}
-                                    </span>
-                                </GhFormGroup>
-                            </div>
-                        </div>
-                    </div>
-
-                    <GhFormGroup class="no-margin">
-                        <label for="tips-and-donations-link" class="fw6 mb1">Shareable link — <a href="#" {{on "click" this.showPreview}}>Preview</a></label>
-                        <div class="gh-tips-and-donations-link-container">
-                            <GhTextInput
-                                data-test-input="tips-and-donations-link"
-                                @id="gh-tips-and-donations-link"
-                                @name="tips-and-donations-link"
-                                @disabled={{true}}
-                                @value="{{this.siteUrl}}/#/portal/support"
-                                @placeholder="{{this.siteUrl}}/#/portal/support"
-                            />
-                            <button
-                                type="button" {{on "click" (fn (perform this.copyTipsAndDonationsLink))}}
-                                class="gh-portal-setting-copy"
-                                data-test-button="copy-url-attr"
-                            >
-                                {{#if (and this.copyTipsAndDonationsLink.isRunning)}}
-                                    {{svg-jar "check-circle" class="w3 v-mid mr2 stroke-darkgrey"}} Copied
-                                {{else}}
-                                    <span data-tooltip="Copy">{{svg-jar "copy" class="w4 v-mid fill-darkgrey"}}</span>
-                                {{/if}}
-                            </button>
-                        </div>
-                    </GhFormGroup>
-
-                </div>
-                {{#if this.tipsAndDonationsError}}
-                    <p class="gh-setting-error"><span class="red">{{this.tipsAndDonationsError}}</span></p>
-                {{/if}}
-            </GhFormGroup>
-        </div>
-        {{/liquid-if}}
-    </div>
-</div>
diff --git a/ghost/admin/app/components/settings/tips-and-donations.js b/ghost/admin/app/components/settings/tips-and-donations.js
deleted file mode 100644
index 30c35648c88..00000000000
--- a/ghost/admin/app/components/settings/tips-and-donations.js
+++ /dev/null
@@ -1,119 +0,0 @@
-import Component from '@glimmer/component';
-import ConfirmUnsavedChangesModal from '../../components/modals/confirm-unsaved-changes';
-import copyTextToClipboard from 'ghost-admin/utils/copy-text-to-clipboard';
-import envConfig from 'ghost-admin/config/environment';
-import {action} from '@ember/object';
-import {currencies, getSymbol, minimumAmountForCurrency} from 'ghost-admin/utils/currency';
-import {inject} from 'ghost-admin/decorators/inject';
-import {inject as service} from '@ember/service';
-import {task, timeout} from 'ember-concurrency';
-import {tracked} from '@glimmer/tracking';
-
-const CURRENCIES = currencies.map((currency) => {
-    return {
-        value: currency.isoCode,
-        label: `${currency.isoCode}`
-    };
-});
-
-// Stripe doesn't allow amounts over 10,000 as a preset amount
-const MAX_AMOUNT = 10_000;
-
-export default class TipsAndDonations extends Component {
-    @service settings;
-    @service session;
-    @service membersUtils;
-    @service modals;
-
-    @inject config;
-    @tracked tipsAndDonationsError = '';
-
-    get allCurrencies() {
-        return CURRENCIES;
-    }
-
-    get selectedAmount() {
-        return this.settings.donationsSuggestedAmount && this.settings.donationsSuggestedAmount / 100;
-    }
-
-    get selectedCurrency() {
-        return CURRENCIES.findBy('value', this.settings.donationsCurrency);
-    }
-
-    get siteUrl() {
-        return this.config.blogUrl;
-    }
-
-    get isConnectDisallowed() {
-        const siteUrl = this.config.blogUrl;
-        return envConfig.environment !== 'development' && !/^https:/.test(siteUrl);
-    }
-
-    @action
-    setDonationsCurrency(event) {
-        this.settings.donationsCurrency = event.value;
-    }
-
-    @action
-    setDonationsSuggestedAmount(event) {
-        const amount = Math.abs(event.target.value);
-        const amountInCents = Math.round(amount * 100);
-        const currency = this.settings.donationsCurrency;
-        const symbol = getSymbol(currency);
-        const minAmount = minimumAmountForCurrency(currency);
-
-        if (amountInCents !== 0 && amountInCents < (minAmount * 100)) {
-            this.tipsAndDonationsError = `Non-zero amount must be at least ${symbol}${minAmount}.`;
-            return;
-        }
-
-        if (amountInCents !== 0 && amountInCents > (MAX_AMOUNT * 100)) {
-            this.tipsAndDonationsError = `Suggested amount cannot be more than ${symbol}${MAX_AMOUNT}.`;
-            return;
-        }
-
-        this.tipsAndDonationsError = '';
-        this.settings.donationsSuggestedAmount = amountInCents;
-    }
-
-    @action
-    openStripeConnect() {
-        this.args.openStripeConnect();
-    }
-
-    @action
-    async closeStripeConnect() {
-        this.showStripeConnect = false;
-    }
-
-    @action
-    async showPreview(event) {
-        event.preventDefault();
-
-        const preview = () => window.open(`${this.siteUrl}/#/portal/support`, '_blank');
-        const changedAttributes = this.settings.changedAttributes();
-
-        if (changedAttributes && Object.keys(changedAttributes).length > 0) {
-            const shouldClose = await this.modals.open(ConfirmUnsavedChangesModal);
-
-            if (shouldClose) {
-                this.settings.rollbackAttributes();
-                preview();
-            }
-        } else {
-            preview();
-        }
-    }
-
-    @task
-    *copyTipsAndDonationsLink() {
-        const link = document.getElementById('gh-tips-and-donations-link')?.value;
-
-        if (link) {
-            copyTextToClipboard(link);
-            yield timeout(this.isTesting ? 50 : 3000);
-        }
-
-        return true;
-    }
-}
diff --git a/ghost/admin/app/controllers/lexical-editor.js b/ghost/admin/app/controllers/lexical-editor.js
index 7d89311fd12..f8f4188e9cb 100644
--- a/ghost/admin/app/controllers/lexical-editor.js
+++ b/ghost/admin/app/controllers/lexical-editor.js
@@ -131,6 +131,7 @@ export default class LexicalEditorController extends Controller {
     /* private properties ----------------------------------------------------*/
 
     _leaveConfirmed = false;
+    _saveOnLeavePerformed = false;
     _previousTagNames = null; // set by setPost and _postSaved, used in hasDirtyAttributes
 
     /* computed properties ---------------------------------------------------*/
@@ -346,7 +347,10 @@ export default class LexicalEditorController extends Controller {
     @action
     setFeatureImageCaption(html) {
         this.post.set('featureImageCaption', html);
+    }
 
+    @action
+    handleFeatureImageCaptionBlur() {
         if (this.post.isDraft) {
             this.autosaveTask.perform();
         }
@@ -431,9 +435,12 @@ export default class LexicalEditorController extends Controller {
     // _xSave tasks  that will also cancel the autosave task
     @task({group: 'saveTasks'})
     *saveTask(options = {}) {
+        if (this.post.isDestroyed || this.post.isDestroying) {
+            return;
+        }
+
         let prevStatus = this.get('post.status');
         let isNew = this.get('post.isNew');
-        let status;
         const adapterOptions = {};
 
         this.cancelAutosave();
@@ -442,28 +449,39 @@ export default class LexicalEditorController extends Controller {
             return;
         }
 
-        if (options.backgroundSave) {
-            // do not allow a post's status to be set to published by a background save
-            status = 'draft';
+        // leaving the editor should never result in a status change, we only save on editor
+        // leave to trigger a revision save
+        if (options.leavingEditor) {
+            // ensure we always have a status present otherwise we'll error when saving
+            if (!this.post.status) {
+                this.post.status = 'draft';
+            }
         } else {
-            if (this.get('post.pastScheduledTime')) {
-                status = (!this.willSchedule && !this.willPublish) ? 'draft' : 'published';
+            let status;
+
+            if (options.backgroundSave) {
+                // do not allow a post's status to be set to published by a background save
+                status = 'draft';
             } else {
-                if (this.willPublish && !this.get('post.isScheduled')) {
-                    status = 'published';
-                } else if (this.willSchedule && !this.get('post.isPublished')) {
-                    status = 'scheduled';
-                } else if (this.get('post.isSent')) {
-                    status = 'sent';
+                if (this.get('post.pastScheduledTime')) {
+                    status = (!this.willSchedule && !this.willPublish) ? 'draft' : 'published';
                 } else {
-                    status = 'draft';
+                    if (this.willPublish && !this.get('post.isScheduled')) {
+                        status = 'published';
+                    } else if (this.willSchedule && !this.get('post.isPublished')) {
+                        status = 'scheduled';
+                    } else if (this.get('post.isSent')) {
+                        status = 'sent';
+                    } else {
+                        status = 'draft';
+                    }
                 }
             }
-        }
 
-        // set manually here instead of in beforeSaveTask because the
-        // new publishing flow sets the post status manually on publish
-        this.set('post.status', status);
+            // set manually here instead of in beforeSaveTask because the
+            // new publishing flow sets the post status manually on publish
+            this.set('post.status', status);
+        }
 
         const explicitSave = !options.backgroundSave;
         const leavingEditor = options.leavingEditor;
@@ -475,8 +493,6 @@ export default class LexicalEditorController extends Controller {
         try {
             let post = yield this._savePostTask.perform({...options, adapterOptions});
 
-            post.set('statusScratch', null);
-
             // Clear any error notification (if any)
             this.notifications.clearAll();
 
@@ -498,8 +514,7 @@ export default class LexicalEditorController extends Controller {
                 yield this.modals.open(ReAuthenticateModal);
 
                 if (this.session.isAuthenticated) {
-                    this.saveTask.perform(options);
-                    return;
+                    return this.saveTask.perform(options);
                 }
             }
 
@@ -680,7 +695,6 @@ export default class LexicalEditorController extends Controller {
                     scope.setTag('post_type', post.isPage ? 'page' : 'post');
                     scope.setTag('save_revision', options.adapterOptions?.saveRevision);
                     scope.setTag('email_segment', options.adapterOptions?.emailSegment);
-                    scope.setTag('save_revision', options.adapterOptions?.saveRevision);
                     scope.setTag('convert_to_lexical', options.adapterOptions?.convertToLexical);
                 });
             }
@@ -693,7 +707,6 @@ export default class LexicalEditorController extends Controller {
                     scope.setTag('post_type', post.isPage ? 'page' : 'post');
                     scope.setTag('save_revision', options.adapterOptions?.saveRevision);
                     scope.setTag('email_segment', options.adapterOptions?.emailSegment);
-                    scope.setTag('save_revision', options.adapterOptions?.saveRevision);
                     scope.setTag('convert_to_lexical', options.adapterOptions?.convertToLexical);
                 });
             }
@@ -938,21 +951,6 @@ export default class LexicalEditorController extends Controller {
             return;
         }
 
-        // wait for any save to finish before continuing to avoid any issues
-        // with attempting a new save whilst another has requests in-flight
-        if (this.saveTask.isRunning) {
-            transition.abort();
-            await this.saveTask.last;
-            return transition.retry();
-        }
-        // extra handling for PSM-triggered save tasks that aren't captured above
-        // NOTE: we don't wait on `_savePostTask` as it's only used as a child task
-        if (this.savePostTask.isRunning) {
-            transition.abort();
-            await this.savePostTask.last;
-            return transition.retry();
-        }
-
         // user can enter the slug name and then leave the post page,
         // in such case we should wait until the slug would be saved on backend
         if (this.updateSlugTask.isRunning) {
@@ -961,6 +959,10 @@ export default class LexicalEditorController extends Controller {
             return transition.retry();
         }
 
+        const fromNewToEdit = this.router.currentRouteName === 'lexical-editor.new'
+            && transition.targetName === 'lexical-editor.edit'
+            && transition.intent.contexts?.[0]?.id === post.id;
+
         // clean up blank cards when leaving the editor if we have a draft post
         // - blank cards could be left around due to autosave triggering whilst
         //   a blank card is present then the user attempting to leave
@@ -970,31 +972,30 @@ export default class LexicalEditorController extends Controller {
         //     this._koenig.cleanup();
         // }
 
+        // if we need to save when leaving the editor, abort the transition, save,
+        // then retry. If a previous transition already performed a save, skip to
+        // avoid potential infinite transition+save loops
+
         let hasDirtyAttributes = this.hasDirtyAttributes;
         let state = post.getProperties('isDeleted', 'isSaving', 'hasDirtyAttributes', 'isNew');
 
         // Check if anything has changed since the last revision
         let postRevisions = post.get('postRevisions').toArray();
         let latestRevision = postRevisions[postRevisions.length - 1];
-        let hasChangedSinceLastRevision = !post.isNew && post.lexical.replaceAll(this.config.blogUrl, '') !== latestRevision.lexical.replaceAll(this.config.blogUrl, '');
-
-        let fromNewToEdit = this.router.currentRouteName === 'lexical-editor.new'
-            && transition.targetName === 'lexical-editor.edit'
-            && transition.intent.contexts
-            && transition.intent.contexts[0]
-            && transition.intent.contexts[0].id === post.id;
+        let hasChangedSinceLastRevision = !latestRevision || (!post.isNew && post.lexical.replaceAll(this.config.blogUrl, '') !== latestRevision.lexical.replaceAll(this.config.blogUrl, ''));
 
         let deletedWithoutChanges = state.isDeleted
-            && (state.isSaving || !state.hasDirtyAttributes);
+                && (state.isSaving || !state.hasDirtyAttributes);
 
         // If leaving the editor and the post has changed since we last saved a revision, always save a new revision
-        if (hasChangedSinceLastRevision) {
+        if (!this._saveOnLeavePerformed && hasChangedSinceLastRevision && hasDirtyAttributes) {
             transition.abort();
             if (this._autosaveRunning) {
                 this.cancelAutosave();
                 this.autosaveTask.cancelAll();
             }
             await this.autosaveTask.perform({leavingEditor: true, backgroundSave: false});
+            this._saveOnLeavePerformed = true;
             return transition.retry();
         }
 
@@ -1015,7 +1016,10 @@ export default class LexicalEditorController extends Controller {
                 this.autosaveTask.cancelAll();
 
                 // If leaving the editor, always save a revision
-                await this.autosaveTask.perform({leavingEditor: true});
+                if (!this._saveOnLeavePerformed) {
+                    await this.autosaveTask.perform({leavingEditor: true});
+                    this._saveOnLeavePerformed = true;
+                }
                 return transition.retry();
             }
 
@@ -1065,6 +1069,7 @@ export default class LexicalEditorController extends Controller {
 
         this._previousTagNames = [];
         this._leaveConfirmed = false;
+        this._saveOnLeavePerformed = false;
 
         this.set('post', null);
         this.set('hasDirtyAttributes', false);
diff --git a/ghost/admin/app/controllers/settings.js b/ghost/admin/app/controllers/settings.js
deleted file mode 100644
index dd9f9e990f0..00000000000
--- a/ghost/admin/app/controllers/settings.js
+++ /dev/null
@@ -1,14 +0,0 @@
-import AboutModal from '../components/modals/settings/about';
-import Controller from '@ember/controller';
-import {action} from '@ember/object';
-import {inject as service} from '@ember/service';
-
-export default class SettingsController extends Controller {
-    @service modals;
-    @service upgradeStatus;
-
-    @action
-    openAbout() {
-        this.advancedModal = this.modals.open(AboutModal);
-    }
-}
diff --git a/ghost/admin/app/controllers/settings/analytics.js b/ghost/admin/app/controllers/settings/analytics.js
deleted file mode 100644
index 2f51689d40e..00000000000
--- a/ghost/admin/app/controllers/settings/analytics.js
+++ /dev/null
@@ -1,13 +0,0 @@
-import Controller from '@ember/controller';
-import {inject as service} from '@ember/service';
-import {task} from 'ember-concurrency';
-
-export default class AnalyticsController extends Controller {
-    @service settings;
-
-    @task({drop: true})
-    *saveSettings() {
-        const response = yield this.settings.save();
-        return response;
-    }
-}
diff --git a/ghost/admin/app/controllers/settings/announcement-bar/index.js b/ghost/admin/app/controllers/settings/announcement-bar/index.js
deleted file mode 100644
index 2d775b16bc0..00000000000
--- a/ghost/admin/app/controllers/settings/announcement-bar/index.js
+++ /dev/null
@@ -1,62 +0,0 @@
-import Controller from '@ember/controller';
-import {action} from '@ember/object';
-import {inject} from 'ghost-admin/decorators/inject';
-import {inject as service} from '@ember/service';
-import {task} from 'ember-concurrency';
-import {tracked} from '@glimmer/tracking';
-
-export default class SettingsAnnouncementBarIndexController extends Controller {
-    @service customThemeSettings;
-    @service notifications;
-    @service settings;
-    @service themeManagement;
-
-    @inject config;
-
-    @tracked previewSize = 'desktop';
-
-    get isDesktopPreview() {
-        return this.previewSize === 'desktop';
-    }
-
-    get isMobilePreview() {
-        return this.previewSize === 'mobile';
-    }
-
-    @action
-    setPreviewSize(size) {
-        this.previewSize = size;
-    }
-
-    @action
-    saveFromKeyboard() {
-        document.activeElement.blur?.();
-        return this.saveTask.perform();
-    }
-
-    @task
-    *saveTask() {
-        try {
-            if (this.settings.errors.length !== 0) {
-                return;
-            }
-
-            yield Promise.all([
-                this.settings.save()
-            ]);
-
-            // ensure task button switches to success state
-            return true;
-        } catch (error) {
-            if (error) {
-                this.notifications.showAPIError(error);
-                throw error;
-            }
-        }
-    }
-
-    reset() {
-        this.previewSize = 'desktop';
-        this.themeManagement.setPreviewType('homepage');
-    }
-}
diff --git a/ghost/admin/app/controllers/settings/code-injection.js b/ghost/admin/app/controllers/settings/code-injection.js
deleted file mode 100644
index 623766a4634..00000000000
--- a/ghost/admin/app/controllers/settings/code-injection.js
+++ /dev/null
@@ -1,26 +0,0 @@
-import Controller from '@ember/controller';
-import {action} from '@ember/object';
-import {inject as service} from '@ember/service';
-import {task} from 'ember-concurrency';
-
-export default class CodeInjectionController extends Controller {
-    @service notifications;
-    @service settings;
-
-    @action
-    save() {
-        this.saveTask.perform();
-    }
-
-    @task
-    *saveTask() {
-        let notifications = this.notifications;
-
-        try {
-            return yield this.settings.save();
-        } catch (error) {
-            notifications.showAPIError(error, {key: 'code-injection.save'});
-            throw error;
-        }
-    }
-}
diff --git a/ghost/admin/app/controllers/settings/design.js b/ghost/admin/app/controllers/settings/design.js
deleted file mode 100644
index 15ec4c3b600..00000000000
--- a/ghost/admin/app/controllers/settings/design.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import Controller from '@ember/controller';
-
-export default class SettingsDesignController extends Controller {
-}
diff --git a/ghost/admin/app/controllers/settings/design/change-theme.js b/ghost/admin/app/controllers/settings/design/change-theme.js
deleted file mode 100644
index c425c02bc2a..00000000000
--- a/ghost/admin/app/controllers/settings/design/change-theme.js
+++ /dev/null
@@ -1,207 +0,0 @@
-import Controller from '@ember/controller';
-import {action} from '@ember/object';
-import {inject as service} from '@ember/service';
-import {tracked} from '@glimmer/tracking';
-
-export default class ChangeThemeController extends Controller {
-    @service router;
-    @service store;
-    @service themeManagement;
-
-    @tracked showAdvanced = false;
-
-    themes = this.store.peekAll('theme');
-
-    officialThemes = [{
-        name: 'Source',
-        category: 'News',
-        previewUrl: 'https://source.ghost.io/',
-        ref: 'default',
-        image: 'assets/img/themes/Source.png'
-    }, {
-        name: 'Casper',
-        category: 'Blog',
-        previewUrl: 'https://demo.ghost.io/',
-        ref: 'TryGhost/Casper',
-        image: 'assets/img/themes/Casper.png'
-    }, {
-        name: 'Edition',
-        category: 'Newsletter',
-        url: 'https://github.com/TryGhost/Edition',
-        previewUrl: 'https://edition.ghost.io/',
-        ref: 'TryGhost/Edition',
-        image: 'assets/img/themes/Edition.png'
-    }, {
-        name: 'Solo',
-        category: 'Blog',
-        url: 'https://github.com/TryGhost/Solo',
-        previewUrl: 'https://solo.ghost.io',
-        ref: 'TryGhost/Solo',
-        image: 'assets/img/themes/Solo.png'
-    }, {
-        name: 'Taste',
-        category: 'Blog',
-        url: 'https://github.com/TryGhost/Taste',
-        previewUrl: 'https://taste.ghost.io',
-        ref: 'TryGhost/Taste',
-        image: 'assets/img/themes/Taste.png'
-    }, {
-        name: 'Episode',
-        category: 'Podcast',
-        url: 'https://github.com/TryGhost/Episode',
-        previewUrl: 'https://episode.ghost.io',
-        ref: 'TryGhost/Episode',
-        image: 'assets/img/themes/Episode.png'
-    }, {
-        name: 'Digest',
-        category: 'Newsletter',
-        url: 'https://github.com/TryGhost/Digest',
-        previewUrl: 'https://digest.ghost.io/',
-        ref: 'TryGhost/Digest',
-        image: 'assets/img/themes/Digest.png'
-    }, {
-        name: 'Bulletin',
-        category: 'Newsletter',
-        url: 'https://github.com/TryGhost/Bulletin',
-        previewUrl: 'https://bulletin.ghost.io/',
-        ref: 'TryGhost/Bulletin',
-        image: 'assets/img/themes/Bulletin.png'
-    }, {
-        name: 'Alto',
-        category: 'Blog',
-        url: 'https://github.com/TryGhost/Alto',
-        previewUrl: 'https://alto.ghost.io',
-        ref: 'TryGhost/Alto',
-        image: 'assets/img/themes/Alto.png'
-    }, {
-        name: 'Dope',
-        category: 'Magazine',
-        url: 'https://github.com/TryGhost/Dope',
-        previewUrl: 'https://dope.ghost.io',
-        ref: 'TryGhost/Dope',
-        image: 'assets/img/themes/Dope.png'
-    }, {
-        name: 'Wave',
-        category: 'Podcast',
-        url: 'https://github.com/TryGhost/Wave',
-        previewUrl: 'https://wave.ghost.io',
-        ref: 'TryGhost/Wave',
-        image: 'assets/img/themes/Wave.png'
-    }, {
-        name: 'Edge',
-        category: 'Photography',
-        url: 'https://github.com/TryGhost/Edge',
-        previewUrl: 'https://edge.ghost.io',
-        ref: 'TryGhost/Edge',
-        image: 'assets/img/themes/Edge.png'
-    }, {
-        name: 'Dawn',
-        category: 'Newsletter',
-        url: 'https://github.com/TryGhost/Dawn',
-        previewUrl: 'https://dawn.ghost.io/',
-        ref: 'TryGhost/Dawn',
-        image: 'assets/img/themes/Dawn.png'
-    }, {
-        name: 'Ease',
-        category: 'Documentation',
-        url: 'https://github.com/TryGhost/Ease',
-        previewUrl: 'https://ease.ghost.io',
-        ref: 'TryGhost/Ease',
-        image: 'assets/img/themes/Ease.png'
-    }, {
-        name: 'Headline',
-        category: 'News',
-        url: 'https://github.com/TryGhost/Headline',
-        previewUrl: 'https://headline.ghost.io',
-        ref: 'TryGhost/Headline',
-        image: 'assets/img/themes/Headline.png'
-    }, {
-        name: 'Ruby',
-        category: 'Magazine',
-        url: 'https://github.com/TryGhost/Ruby',
-        previewUrl: 'https://ruby.ghost.io',
-        ref: 'TryGhost/Ruby',
-        image: 'assets/img/themes/Ruby.png'
-    }, {
-        name: 'London',
-        category: 'Photography',
-        url: 'https://github.com/TryGhost/London',
-        previewUrl: 'https://london.ghost.io',
-        ref: 'TryGhost/London',
-        image: 'assets/img/themes/London.png'
-    }, {
-        name: 'Journal',
-        category: 'Newsletter',
-        url: 'https://github.com/TryGhost/Journal',
-        previewUrl: 'https://journal.ghost.io/',
-        ref: 'TryGhost/Journal',
-        image: 'assets/img/themes/Journal.png'
-    }];
-
-    get themesList() {
-        const activeTheme = this.themes.findBy('active', true);
-
-        // decorate themes based on current usage
-        let themesList = this.officialThemes.map((theme) => {
-            const decoratedTheme = Object.assign({}, theme);
-
-            if (theme.ref === 'default') {
-                decoratedTheme.isDefault = true;
-            }
-
-            if (typeof activeTheme !== 'undefined'
-                && theme.name.toLowerCase() === activeTheme.name) {
-                decoratedTheme.isActive = true;
-            }
-
-            return decoratedTheme;
-        });
-
-        // move default themes to the beginning of the list
-        themesList.sort((a, b) => {
-            if (b.isDefault) {
-                return 1;
-            }
-
-            return 0;
-        });
-
-        // ensure active theme is always first
-        const activeThemeInList = themesList.find(theme => theme.isActive);
-        const activeThemeIndex = themesList.indexOf(activeThemeInList);
-        if (activeThemeIndex > 0) {
-            themesList.splice(activeThemeIndex, 1);
-            themesList.unshift(activeThemeInList);
-        }
-
-        return themesList;
-    }
-
-    @action
-    startThemeUpload(event) {
-        event?.preventDefault();
-
-        this.themeManagement.upload({
-            onActivationSuccess: () => {
-                this.router.transitionTo('settings.design');
-            }
-        });
-    }
-
-    @action
-    toggleAdvanced(event) {
-        this.showAdvanced = !this.showAdvanced;
-
-        if (this.showAdvanced) {
-            const mainContainer = event?.target.closest('.gh-main');
-
-            if (mainContainer) {
-                mainContainer.scrollTop = 0;
-            }
-        }
-    }
-
-    reset() {
-        this.showAdvanced = false;
-    }
-}
diff --git a/ghost/admin/app/controllers/settings/design/change-theme/install.js b/ghost/admin/app/controllers/settings/design/change-theme/install.js
deleted file mode 100644
index 33468d4d0f0..00000000000
--- a/ghost/admin/app/controllers/settings/design/change-theme/install.js
+++ /dev/null
@@ -1,9 +0,0 @@
-import Controller from '@ember/controller';
-import {tracked} from '@glimmer/tracking';
-
-export default class InstallThemeController extends Controller {
-    queryParams = ['source', 'ref'];
-
-    @tracked source = '';
-    @tracked ref = '';
-}
diff --git a/ghost/admin/app/controllers/settings/design/index.js b/ghost/admin/app/controllers/settings/design/index.js
deleted file mode 100644
index ef67b0399e8..00000000000
--- a/ghost/admin/app/controllers/settings/design/index.js
+++ /dev/null
@@ -1,63 +0,0 @@
-import Controller from '@ember/controller';
-import {action} from '@ember/object';
-import {inject} from 'ghost-admin/decorators/inject';
-import {inject as service} from '@ember/service';
-import {task} from 'ember-concurrency';
-import {tracked} from '@glimmer/tracking';
-
-export default class SettingsDesignIndexController extends Controller {
-    @service customThemeSettings;
-    @service notifications;
-    @service settings;
-    @service themeManagement;
-
-    @inject config;
-
-    @tracked previewSize = 'desktop';
-
-    get isDesktopPreview() {
-        return this.previewSize === 'desktop';
-    }
-
-    get isMobilePreview() {
-        return this.previewSize === 'mobile';
-    }
-
-    @action
-    setPreviewSize(size) {
-        this.previewSize = size;
-    }
-
-    @action
-    saveFromKeyboard() {
-        document.activeElement.blur?.();
-        return this.saveTask.perform();
-    }
-
-    @task
-    *saveTask() {
-        try {
-            if (this.settings.errors.length !== 0) {
-                return;
-            }
-
-            yield Promise.all([
-                this.settings.save(),
-                this.customThemeSettings.save()
-            ]);
-
-            // ensure task button switches to success state
-            return true;
-        } catch (error) {
-            if (error) {
-                this.notifications.showAPIError(error);
-                throw error;
-            }
-        }
-    }
-
-    reset() {
-        this.previewSize = 'desktop';
-        this.themeManagement.setPreviewType('homepage');
-    }
-}
diff --git a/ghost/admin/app/controllers/settings/general.js b/ghost/admin/app/controllers/settings/general.js
deleted file mode 100644
index 00e602537c6..00000000000
--- a/ghost/admin/app/controllers/settings/general.js
+++ /dev/null
@@ -1,174 +0,0 @@
-import classic from 'ember-classic-decorator';
-import {action, computed} from '@ember/object';
-import {inject as service} from '@ember/service';
-/* eslint-disable ghost/ember/alias-model-in-controller */
-import Controller from '@ember/controller';
-import generatePassword from 'ghost-admin/utils/password-generator';
-import {
-    IMAGE_EXTENSIONS,
-    IMAGE_MIME_TYPES
-} from 'ghost-admin/components/gh-image-uploader';
-import {TrackedObject} from 'tracked-built-ins';
-import {inject} from 'ghost-admin/decorators/inject';
-import {run} from '@ember/runloop';
-import {task} from 'ember-concurrency';
-import {tracked} from '@glimmer/tracking';
-
-function randomPassword() {
-    let word = generatePassword(6);
-    let randomN = Math.floor(Math.random() * 1000);
-
-    return word + randomN;
-}
-
-@classic
-export default class GeneralController extends Controller {
-    @service ghostPaths;
-    @service notifications;
-    @service session;
-    @service settings;
-    @service frontend;
-    @service ui;
-
-    @inject config;
-
-    @tracked scratchValues = new TrackedObject();
-
-    imageExtensions = IMAGE_EXTENSIONS;
-    imageMimeTypes = IMAGE_MIME_TYPES;
-
-    get availableTimezones() {
-        return this.config.availableTimezones;
-    }
-
-    @computed('config.blogUrl', 'settings.publicHash')
-    get privateRSSUrl() {
-        let blogUrl = this.config.blogUrl;
-        let publicHash = this.settings.publicHash;
-
-        return `${blogUrl}/${publicHash}/rss`;
-    }
-
-    @action
-    save() {
-        this.saveTask.perform();
-    }
-
-    @action
-    setTimezone(timezone) {
-        this.settings.timezone = timezone.name;
-    }
-
-    @action
-    removeImage(image) {
-        // setting `null` here will error as the server treats it as "null"
-        this.settings[image] = '';
-    }
-
-    /**
-     * Opens a file selection dialog - Triggered by "Upload Image" buttons,
-     * searches for the hidden file input within the .gh-setting element
-     * containing the clicked button then simulates a click
-     * @param  {MouseEvent} event - MouseEvent fired by the button click
-     */
-    @action
-    triggerFileDialog(event) {
-        event?.target.closest('.gh-setting-action')?.querySelector('input[type="file"]')?.click();
-    }
-
-    /**
-     * Fired after an image upload completes
-     * @param  {string} property - Property name to be set on `this.settings`
-     * @param  {UploadResult[]} results - Array of UploadResult objects
-     * @return {string} The URL that was set on `this.settings.property`
-     */
-    @action
-    imageUploaded(property, results) {
-        if (results[0]) {
-            return this.settings[property] = results[0].url;
-        }
-    }
-
-    @action
-    toggleIsPrivate(isPrivate) {
-        let settings = this.settings;
-
-        settings.isPrivate = isPrivate;
-        settings.errors.remove('password');
-
-        let changedAttrs = settings.changedAttributes();
-
-        // set a new random password when isPrivate is enabled
-        if (isPrivate && changedAttrs.isPrivate) {
-            settings.password = randomPassword();
-
-        // reset the password when isPrivate is disabled
-        } else if (changedAttrs.password) {
-            settings.password = changedAttrs.password[0];
-        }
-    }
-
-    @action
-    setScratchValue(property, value) {
-        this.scratchValues[property] = value;
-    }
-
-    clearScratchValues() {
-        this.scratchValues = new TrackedObject();
-    }
-
-    _deleteTheme() {
-        let theme = this.store.peekRecord('theme', this.themeToDelete.name);
-
-        if (!theme) {
-            return;
-        }
-
-        return theme.destroyRecord().catch((error) => {
-            this.notifications.showAPIError(error);
-        });
-    }
-
-    @task
-    *saveTask() {
-        let notifications = this.notifications;
-
-        try {
-            let changedAttrs = this.settings.changedAttributes();
-            let settings = yield this.settings.save();
-
-            this.clearScratchValues();
-
-            this.config.blogTitle = settings.title;
-
-            if (changedAttrs.password) {
-                this.frontend.loginIfNeeded();
-            }
-
-            // this forces the document title to recompute after a blog title change
-            this.ui.updateDocumentTitle();
-
-            return settings;
-        } catch (error) {
-            if (error) {
-                notifications.showAPIError(error, {key: 'settings.save'});
-            }
-            throw error;
-        }
-    }
-
-    @action
-    saveViaKeyboard(event) {
-        event.preventDefault();
-
-        // trigger any set-on-blur actions
-        const focusedElement = document.activeElement;
-        focusedElement?.blur();
-
-        // schedule save for when set-on-blur actions have finished
-        run.schedule('actions', this, function () {
-            focusedElement?.focus();
-            this.saveTask.perform();
-        });
-    }
-}
diff --git a/ghost/admin/app/controllers/settings/history.js b/ghost/admin/app/controllers/settings/history.js
deleted file mode 100644
index 867a679a57d..00000000000
--- a/ghost/admin/app/controllers/settings/history.js
+++ /dev/null
@@ -1,44 +0,0 @@
-import Controller from '@ember/controller';
-import {action} from '@ember/object';
-import {inject as service} from '@ember/service';
-import {tracked} from '@glimmer/tracking';
-
-export default class HistoryController extends Controller {
-    @service router;
-    @service settings;
-    @service store;
-
-    queryParams = ['excludedEvents', 'excludedResources', 'user'];
-
-    @tracked excludedEvents = null;
-    @tracked excludedResources = null;
-    @tracked user = null;
-
-    get fullExcludedEvents() {
-        return (this.excludedEvents || '').split(',');
-    }
-
-    get fullExcludedResources() {
-        return (this.excludedResources || '').split(',');
-    }
-
-    get userRecord() {
-        if (!this.user) {
-            return null;
-        }
-
-        // TODO: {reload: true} here shouldn't be needed but without it
-        // the template renders nothing if the record is already in the store
-        return this.store.findRecord('user', this.user, {reload: true});
-    }
-
-    @action
-    changeExcludedItems({excludedEvents, excludedResources} = {}) {
-        this.router.transitionTo({queryParams: {excludedEvents, excludedResources}});
-    }
-
-    @action
-    changeUser(user) {
-        this.router.transitionTo({queryParams: {user: user?.id}});
-    }
-}
diff --git a/ghost/admin/app/controllers/settings/integration.js b/ghost/admin/app/controllers/settings/integration.js
deleted file mode 100644
index 2a6f8f86fdb..00000000000
--- a/ghost/admin/app/controllers/settings/integration.js
+++ /dev/null
@@ -1,165 +0,0 @@
-import Controller from '@ember/controller';
-import DeleteIntegrationModal from '../../components/settings/integrations/delete-integration-modal';
-import DeleteWebhookModal from '../../components/settings/integrations/delete-webhook-modal';
-import RegenerateKeyModal from '../../components/settings/integrations/regenerate-key-modal';
-import config from 'ghost-admin/config/environment';
-import copyTextToClipboard from 'ghost-admin/utils/copy-text-to-clipboard';
-import {
-    IMAGE_EXTENSIONS,
-    IMAGE_MIME_TYPES
-} from 'ghost-admin/components/gh-image-uploader';
-import {action} from '@ember/object';
-import {htmlSafe} from '@ember/template';
-import {inject} from 'ghost-admin/decorators/inject';
-import {inject as service} from '@ember/service';
-import {task, timeout} from 'ember-concurrency';
-import {tracked} from '@glimmer/tracking';
-
-export default class IntegrationController extends Controller {
-    @service ghostPaths;
-    @service modals;
-
-    @inject config;
-
-    imageExtensions = IMAGE_EXTENSIONS;
-    imageMimeTypes = IMAGE_MIME_TYPES;
-
-    @tracked regeneratedApiKey = null;
-
-    constructor() {
-        super(...arguments);
-        if (this.isTesting === undefined) {
-            this.isTesting = config.environment === 'test';
-        }
-    }
-
-    get integration() {
-        return this.model;
-    }
-
-    get apiUrl() {
-        let origin = window.location.origin;
-        let subdir = this.ghostPaths.subdir;
-        let url = this.ghostPaths.url.join(origin, subdir);
-
-        return url.replace(/\/$/, '');
-    }
-
-    get allWebhooks() {
-        return this.store.peekAll('webhook');
-    }
-
-    get filteredWebhooks() {
-        return this.allWebhooks.filter((webhook) => {
-            let matchesIntegration = webhook.belongsTo('integration').id() === this.integration.id;
-
-            return matchesIntegration
-                && !webhook.isNew
-                && !webhook.isDeleted;
-        });
-    }
-
-    get iconImageStyle() {
-        let url = this.integration.iconImage;
-        if (url) {
-            let styles = [
-                `background-image: url(${url})`,
-                'background-size: 50%',
-                'background-position: 50%',
-                'background-repeat: no-repeat'
-            ];
-            return htmlSafe(styles.join('; '));
-        }
-
-        return htmlSafe('');
-    }
-
-    @action
-    triggerIconFileDialog(event) {
-        event.preventDefault();
-        let input = document.querySelector('input[type="file"][name="iconImage"]');
-        input.click();
-    }
-
-    @action
-    updateProperty(property, event) {
-        this.integration.set(property, event.target.value);
-    }
-
-    @action
-    validateProperty(property) {
-        this.integration.validate({property});
-    }
-
-    @action
-    setIconImage([image]) {
-        this.integration.set('iconImage', image.url);
-    }
-
-    @action
-    save() {
-        return this.saveTask.perform();
-    }
-
-    @action
-    confirmIntegrationDeletion(event) {
-        event?.preventDefault();
-        return this.modals.open(DeleteIntegrationModal, {
-            integration: this.integration
-        });
-    }
-
-    @action
-    async confirmRegenerateKey(apiKey, event) {
-        event?.preventDefault();
-        this.regeneratedApiKey = null;
-        this.regeneratedApiKey = await this.modals.open(RegenerateKeyModal, {
-            apiKey,
-            integration: this.integration
-        });
-    }
-
-    @action
-    confirmWebhookDeletion(webhook, event) {
-        event?.preventDefault();
-        return this.modals.open(DeleteWebhookModal, {webhook});
-    }
-
-    @action
-    deleteWebhook(event) {
-        event?.preventDefault();
-        return this.webhookToDelete.destroyRecord();
-    }
-
-    @task
-    *saveTask() {
-        try {
-            return yield this.integration.save();
-        } catch (e) {
-            if (e === undefined) {
-                // validation error
-                return false;
-            }
-
-            throw e;
-        }
-    }
-
-    @task
-    *copyContentKey() {
-        copyTextToClipboard(this.integration.contentKey.secret);
-        yield timeout(this.isTesting ? 50 : 3000);
-    }
-
-    @task
-    *copyAdminKey() {
-        copyTextToClipboard(this.integration.adminKey.secret);
-        yield timeout(this.isTesting ? 50 : 3000);
-    }
-
-    @task
-    *copyApiUrl() {
-        copyTextToClipboard(this.apiUrl);
-        yield timeout(this.isTesting ? 50 : 3000);
-    }
-}
diff --git a/ghost/admin/app/controllers/settings/integration/webhooks/edit.js b/ghost/admin/app/controllers/settings/integration/webhooks/edit.js
deleted file mode 100644
index a1c986ec4fc..00000000000
--- a/ghost/admin/app/controllers/settings/integration/webhooks/edit.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import Controller from '@ember/controller';
-
-export default class EditController extends Controller {
-}
diff --git a/ghost/admin/app/controllers/settings/integration/webhooks/new.js b/ghost/admin/app/controllers/settings/integration/webhooks/new.js
deleted file mode 100644
index 2c1d6ff7580..00000000000
--- a/ghost/admin/app/controllers/settings/integration/webhooks/new.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import Controller from '@ember/controller';
-
-export default class NewWebhookController extends Controller {
-}
diff --git a/ghost/admin/app/controllers/settings/integrations.js b/ghost/admin/app/controllers/settings/integrations.js
deleted file mode 100644
index 9a9b6c4a8d3..00000000000
--- a/ghost/admin/app/controllers/settings/integrations.js
+++ /dev/null
@@ -1,53 +0,0 @@
-import Controller from '@ember/controller';
-import {inject} from 'ghost-admin/decorators/inject';
-import {inject as service} from '@ember/service';
-import {task} from 'ember-concurrency';
-
-export default class IntegrationsController extends Controller {
-    @service settings;
-    @service store;
-
-    @inject config;
-
-    _allIntegrations = this.store.peekAll('integration');
-
-    get zapierDisabled() {
-        return this.config.hostSettings?.limits?.customIntegrations?.disabled;
-    }
-
-    // filter over the live query so that the list is automatically updated
-    // as integrations are added/removed
-    get integrations() {
-        return this._allIntegrations.reject((integration) => {
-            return integration.isNew || integration.type !== 'custom';
-        });
-    }
-
-    // use ember-concurrency so that we can use the derived state to show
-    // a spinner only in the integrations list and avoid delaying the whole
-    // screen display
-    @task
-    *fetchIntegrations() {
-        return yield this.store.findAll('integration');
-    }
-
-    // used by individual integration routes' `model` hooks
-    integrationModelHook(prop, value, route, transition) {
-        let preloadedIntegration = this.store.peekAll('integration').findBy(prop, value);
-
-        if (preloadedIntegration) {
-            return preloadedIntegration;
-        }
-
-        return this.fetchIntegrations.perform().then((integrations) => {
-            let integration = integrations.findBy(prop, value);
-
-            if (!integration) {
-                let path = transition.intent.url.replace(/^\//, '');
-                return route.replaceWith('error404', {path, status: 404});
-            }
-
-            return integration;
-        });
-    }
-}
diff --git a/ghost/admin/app/controllers/settings/integrations/amp.js b/ghost/admin/app/controllers/settings/integrations/amp.js
deleted file mode 100644
index 7edbbcb65c5..00000000000
--- a/ghost/admin/app/controllers/settings/integrations/amp.js
+++ /dev/null
@@ -1,30 +0,0 @@
-import Controller from '@ember/controller';
-import {action} from '@ember/object';
-import {inject as service} from '@ember/service';
-import {task} from 'ember-concurrency';
-
-export default class AmpController extends Controller {
-    @service notifications;
-    @service settings;
-
-    @action
-    update(value) {
-        this.settings.amp = value;
-    }
-
-    @action
-    save() {
-        this.saveTask.perform();
-    }
-
-    @task({drop: true})
-    *saveTask() {
-        try {
-            yield this.settings.validate();
-            return yield this.settings.save();
-        } catch (error) {
-            this.notifications.showAPIError(error);
-            throw error;
-        }
-    }
-}
diff --git a/ghost/admin/app/controllers/settings/integrations/firstpromoter.js b/ghost/admin/app/controllers/settings/integrations/firstpromoter.js
deleted file mode 100644
index 6b1432d650e..00000000000
--- a/ghost/admin/app/controllers/settings/integrations/firstpromoter.js
+++ /dev/null
@@ -1,30 +0,0 @@
-import Controller from '@ember/controller';
-import {action} from '@ember/object';
-import {inject as service} from '@ember/service';
-import {task} from 'ember-concurrency';
-
-export default class FirstpromoterController extends Controller {
-    @service notifications;
-    @service settings;
-
-    @action
-    update(value) {
-        this.settings.firstpromoter = value;
-    }
-
-    @action
-    save() {
-        this.saveTask.perform();
-    }
-
-    @task({drop: true})
-    *saveTask() {
-        try {
-            yield this.settings.validate();
-            return yield this.settings.save();
-        } catch (error) {
-            this.notifications.showAPIError(error);
-            throw error;
-        }
-    }
-}
diff --git a/ghost/admin/app/controllers/settings/integrations/pintura.js b/ghost/admin/app/controllers/settings/integrations/pintura.js
deleted file mode 100644
index 2c7623e3cf7..00000000000
--- a/ghost/admin/app/controllers/settings/integrations/pintura.js
+++ /dev/null
@@ -1,97 +0,0 @@
-import Controller from '@ember/controller';
-import config from 'ghost-admin/config/environment';
-import {action} from '@ember/object';
-import {inject} from 'ghost-admin/decorators/inject';
-import {inject as service} from '@ember/service';
-import {task} from 'ember-concurrency';
-import {tracked} from '@glimmer/tracking';
-
-const JS_EXTENSION = ['js'];
-const JS_MIME_TYPE = ['application/javascript'];
-const CSS_EXTENSION = ['css'];
-const CSS_MIME_TYPE = ['text/css'];
-export default class PinturaController extends Controller {
-    @service notifications;
-    @service settings;
-    @service utils;
-
-    @inject config;
-
-    @tracked jsSuccess;
-    @tracked jsFailure;
-    @tracked cssSuccess;
-    @tracked cssFailure;
-
-    get showUploadSettings() {
-        return this.settings.pintura && !this.config.pintura;
-    }
-
-    constructor() {
-        super(...arguments);
-        this.jsExtension = JS_EXTENSION;
-        this.jsMimeType = JS_MIME_TYPE;
-        this.jsAccept = [...this.jsMimeType, ...Array.from(this.jsExtension, extension => '.' + extension)];
-        this.cssExtension = CSS_EXTENSION;
-        this.cssMimeType = CSS_MIME_TYPE;
-        this.cssAccept = [...this.cssMimeType, ...Array.from(this.cssExtension, extension => '.' + extension)];
-    }
-
-    /**
-     * Opens a file selection dialog - Triggered by "Upload x" buttons,
-     * searches for the hidden file input within the .gh-setting element
-     * containing the clicked button then simulates a click
-     * @param  {MouseEvent} event - MouseEvent fired by the button click
-     */
-    @action
-    triggerFileDialog(event) {
-        // simulate click to open file dialog
-        event?.target.closest('.gh-setting-action')?.querySelector('input[type="file"]')?.click();
-    }
-
-    @action
-    async fileUploadCompleted(fileType, [uploadedFile]) {
-        let successKey = `${fileType}Success`;
-        let failureKey = `${fileType}Failure`;
-
-        if (!uploadedFile || !uploadedFile.url && !uploadedFile.fileName) {
-            this[successKey] = false;
-            this[failureKey] = true;
-            return; // upload failed
-        }
-        this[successKey] = true;
-        this[failureKey] = false;
-
-        window.setTimeout(() => {
-            this[successKey] = null;
-            this[failureKey] = null;
-        }, config.environment === 'test' ? 100 : 5000);
-
-        // Save the uploaded file url to the settings
-        if (fileType === 'js') {
-            this.settings.pinturaJsUrl = uploadedFile.url;
-        } else if (fileType === 'css') {
-            this.settings.pinturaCssUrl = uploadedFile.url;
-        }
-    }
-
-    @action
-    update(event) {
-        this.settings.pintura = event.target.checked;
-    }
-
-    @action
-    save() {
-        this.saveTask.perform();
-    }
-
-    @task({drop: true})
-    *saveTask() {
-        try {
-            yield this.settings.validate();
-            return yield this.settings.save();
-        } catch (error) {
-            this.notifications.showAPIError(error);
-            throw error;
-        }
-    }
-}
diff --git a/ghost/admin/app/controllers/settings/integrations/slack.js b/ghost/admin/app/controllers/settings/integrations/slack.js
deleted file mode 100644
index 2393599e6ae..00000000000
--- a/ghost/admin/app/controllers/settings/integrations/slack.js
+++ /dev/null
@@ -1,56 +0,0 @@
-import Controller from '@ember/controller';
-import {action} from '@ember/object';
-import {isInvalidError} from 'ember-ajax/errors';
-import {inject as service} from '@ember/service';
-import {task} from 'ember-concurrency';
-
-export default class SlackController extends Controller {
-    @service ghostPaths;
-    @service ajax;
-    @service notifications;
-    @service settings;
-
-    get testNotificationDisabled() {
-        const slackUrl = this.settings.slackUrl;
-        return !slackUrl;
-    }
-
-    @action
-    save() {
-        this.saveTask.perform();
-    }
-
-    @task({drop: true})
-    *saveTask() {
-        try {
-            yield this.settings.validate();
-            return yield this.settings.save();
-        } catch (error) {
-            if (error) {
-                this.notifications.showAPIError(error);
-                throw error;
-            }
-        }
-    }
-
-    @task({drop: true})
-    *sendTestNotification() {
-        let notifications = this.notifications;
-        let slackApi = this.ghostPaths.url.api('slack', 'test');
-
-        try {
-            yield this.saveTask.perform();
-            yield this.ajax.post(slackApi);
-            notifications.showNotification('Test notification sent', {type: 'info', key: 'slack-test.send.success', description: 'Check your Slack channel for the test message'});
-            return true;
-        } catch (error) {
-            if (error) {
-                notifications.showAPIError(error, {key: 'slack-test:send'});
-
-                if (!isInvalidError(error)) {
-                    throw error;
-                }
-            }
-        }
-    }
-}
diff --git a/ghost/admin/app/controllers/settings/integrations/unsplash.js b/ghost/admin/app/controllers/settings/integrations/unsplash.js
deleted file mode 100644
index da7b4868fe3..00000000000
--- a/ghost/admin/app/controllers/settings/integrations/unsplash.js
+++ /dev/null
@@ -1,30 +0,0 @@
-import Controller from '@ember/controller';
-import {action} from '@ember/object';
-import {inject as service} from '@ember/service';
-import {task} from 'ember-concurrency';
-
-export default class UnsplashController extends Controller {
-    @service notifications;
-    @service settings;
-
-    @action
-    update(value) {
-        this.settings.unsplash = value;
-    }
-
-    @action
-    save() {
-        this.saveTask.perform();
-    }
-
-    @task({drop: true})
-    *saveTask() {
-        try {
-            yield this.settings.validate();
-            return yield this.settings.save();
-        } catch (error) {
-            this.notifications.showAPIError(error);
-            throw error;
-        }
-    }
-}
diff --git a/ghost/admin/app/controllers/settings/integrations/zapier.js b/ghost/admin/app/controllers/settings/integrations/zapier.js
deleted file mode 100644
index a49984e0321..00000000000
--- a/ghost/admin/app/controllers/settings/integrations/zapier.js
+++ /dev/null
@@ -1,59 +0,0 @@
-import Controller from '@ember/controller';
-import RegenerateKeyModal from '../../../components/settings/integrations/regenerate-key-modal';
-import config from 'ghost-admin/config/environment';
-import copyTextToClipboard from 'ghost-admin/utils/copy-text-to-clipboard';
-import {action} from '@ember/object';
-import {inject as service} from '@ember/service';
-import {task, timeout} from 'ember-concurrency';
-import {tracked} from '@glimmer/tracking';
-
-export default class ZapierController extends Controller {
-    @service ghostPaths;
-    @service modals;
-
-    @tracked regeneratedApiKey = null;
-
-    constructor() {
-        super(...arguments);
-        if (this.isTesting === undefined) {
-            this.isTesting = config.environment === 'test';
-        }
-    }
-
-    get integration() {
-        return this.model;
-    }
-
-    get apiUrl() {
-        let origin = window.location.origin;
-        let subdir = this.ghostPaths.subdir;
-        let url = this.ghostPaths.url.join(origin, subdir);
-
-        return url.replace(/\/$/, '');
-    }
-
-    @action
-    async confirmRegenerateKey(apiKey, event) {
-        event?.preventDefault();
-        this.regeneratedApiKey = null;
-        this.regeneratedApiKey = await this.modals.open(RegenerateKeyModal, {
-            apiKey,
-            integration: this.integration,
-            internalIntegration: 'zapier'
-        });
-    }
-
-    @task
-    *copyAdminKeyTask(event) {
-        event?.preventDefault();
-        copyTextToClipboard(this.integration.adminKey.secret);
-        yield timeout(this.isTesting ? 50 : 3000);
-    }
-
-    @task
-    *copyApiUrlTask(event) {
-        event?.preventDefault();
-        copyTextToClipboard(this.apiUrl);
-        yield timeout(this.isTesting ? 50 : 3000);
-    }
-}
diff --git a/ghost/admin/app/controllers/settings/labs.js b/ghost/admin/app/controllers/settings/labs.js
deleted file mode 100644
index 94be24d1154..00000000000
--- a/ghost/admin/app/controllers/settings/labs.js
+++ /dev/null
@@ -1,244 +0,0 @@
-import classic from 'ember-classic-decorator';
-import {inject as service} from '@ember/service';
-/* eslint-disable ghost/ember/alias-model-in-controller */
-import Controller from '@ember/controller';
-import DeleteAllModal from '../../components/settings/labs/delete-all-content-modal';
-import ImportContentModal from '../../components/modal-import-content';
-import RSVP from 'rsvp';
-import config from 'ghost-admin/config/environment';
-import {
-    UnsupportedMediaTypeError,
-    isRequestEntityTooLargeError,
-    isUnsupportedMediaTypeError
-} from 'ghost-admin/services/ajax';
-import {action} from '@ember/object';
-import {inject} from 'ghost-admin/decorators/inject';
-import {isBlank} from '@ember/utils';
-import {isArray as isEmberArray} from '@ember/array';
-import {run} from '@ember/runloop';
-import {task, timeout} from 'ember-concurrency';
-
-const {Promise} = RSVP;
-
-const IMPORT_MIME_TYPES = [
-    'application/json',
-    'application/zip',
-    'application/x-zip-compressed'
-];
-
-const JSON_EXTENSION = ['json'];
-const JSON_MIME_TYPE = ['application/json'];
-
-const YAML_EXTENSION = ['yaml'];
-const YAML_MIME_TYPE = [
-    'text/vnd.yaml',
-    'application/vnd.yaml',
-    'text/x-yaml',
-    'application/x-yaml'
-];
-
-@classic
-export default class LabsController extends Controller {
-    @service ajax;
-    @service feature;
-    @service ghostPaths;
-    @service modals;
-    @service notifications;
-    @service session;
-    @service settings;
-    @service utils;
-
-    @inject config;
-
-    importErrors = null;
-    importSuccessful = false;
-    showEarlyAccessModal = false;
-    submitting = false;
-    uploadButtonText = 'Import';
-    importMimeType = null;
-    redirectsFileExtensions = null;
-    redirectsFileMimeTypes = null;
-    yamlExtension = null;
-    yamlMimeType = null;
-    yamlAccept = null;
-
-    init() {
-        super.init(...arguments);
-        this.importMimeType = IMPORT_MIME_TYPES;
-        this.redirectsFileExtensions = [...JSON_EXTENSION, ...YAML_EXTENSION];
-        // .yaml is added below for file dialogs to show .yaml by default.
-        this.redirectsFileMimeTypes = [...JSON_MIME_TYPE, ...YAML_MIME_TYPE, '.yaml'];
-        this.yamlExtension = YAML_EXTENSION;
-        this.yamlMimeType = YAML_MIME_TYPE;
-        // (macOS) Safari only allows files with the `yml` extension to be selected with the specified MIME types
-        // so explicitly allow the `yaml` extension.
-        this.yamlAccept = [...this.yamlMimeType, ...Array.from(this.yamlExtension, extension => '.' + extension)];
-    }
-
-    @action
-    onUpload(file) {
-        let formData = new FormData();
-        let notifications = this.notifications;
-        let currentUserId = this.get('session.user.id');
-        let dbUrl = this.get('ghostPaths.url').api('db');
-
-        this.set('uploadButtonText', 'Importing');
-        this.set('importErrors', null);
-        this.set('importSuccessful', false);
-
-        return this._validate(file).then(() => {
-            formData.append('importfile', file);
-
-            return this.ajax.post(dbUrl, {
-                data: formData,
-                dataType: 'json',
-                cache: false,
-                contentType: false,
-                processData: false
-            });
-        }).then((response) => {
-            let store = this.store;
-
-            this.set('importSuccessful', true);
-
-            if (response.problems) {
-                this.set('importErrors', response.problems);
-            }
-
-            // Clear the store, so that all the new data gets fetched correctly.
-            store.unloadAll();
-
-            // NOTE: workaround for behaviour change in Ember 2.13
-            // store.unloadAll has some async tendencies so we need to schedule
-            // the reload of the current user once the unload has finished
-            // https://github.com/emberjs/data/issues/4963
-            run.schedule('destroy', this, () => {
-                // Reload currentUser and set session
-                this.session.populateUser({id: currentUserId});
-
-                // TODO: keep as notification, add link to view content
-                notifications.showNotification('Import successful', {key: 'import.upload.success'});
-
-                // reload settings
-                return this.settings.reload().then((settings) => {
-                    this.feature.fetch();
-                    this.config.blogTitle = settings.title;
-                });
-            });
-        }).catch((response) => {
-            if (isUnsupportedMediaTypeError(response) || isRequestEntityTooLargeError(response)) {
-                this.set('importErrors', [response]);
-            } else if (response && response.payload.errors && isEmberArray(response.payload.errors)) {
-                this.set('importErrors', response.payload.errors);
-            } else {
-                this.set('importErrors', [{message: 'Import failed due to an unknown error. Check the Web Inspector console and network tabs for errors.'}]);
-            }
-
-            throw response;
-        }).finally(() => {
-            this.set('uploadButtonText', 'Import');
-        });
-    }
-
-    @action
-    importContent() {
-        return this.modals.open(ImportContentModal);
-    }
-
-    @action
-    downloadFile(endpoint) {
-        this.utils.downloadFile(this.ghostPaths.url.api(endpoint));
-    }
-
-    @action
-    confirmDeleteAll() {
-        return this.modals.open(DeleteAllModal);
-    }
-
-    @action
-    toggleEarlyAccessModal() {
-        this.toggleProperty('showEarlyAccessModal');
-    }
-
-    /**
-     * Opens a file selection dialog - Triggered by "Upload x" buttons,
-     * searches for the hidden file input within the .gh-setting element
-     * containing the clicked button then simulates a click
-     * @param  {MouseEvent} event - MouseEvent fired by the button click
-     */
-    @action
-    triggerFileDialog(event) {
-        // simulate click to open file dialog
-        event?.target.closest('.gh-setting-action')?.querySelector('input[type="file"]')?.click();
-    }
-
-    // TODO: convert to ember-concurrency task
-    _validate(file) {
-        // Windows doesn't have mime-types for json files by default, so we
-        // need to have some additional checking
-        if (file.type === '') {
-            // First check file extension so we can early return
-            let [, extension] = (/(?:\.([^.]+))?$/).exec(file.name);
-
-            if (!extension || extension.toLowerCase() !== 'json') {
-                return RSVP.reject(new UnsupportedMediaTypeError());
-            }
-
-            return new Promise((resolve, reject) => {
-                // Extension is correct, so check the contents of the file
-                let reader = new FileReader();
-
-                reader.onload = function () {
-                    let {result} = reader;
-
-                    try {
-                        JSON.parse(result);
-
-                        return resolve();
-                    } catch (e) {
-                        return reject(new UnsupportedMediaTypeError());
-                    }
-                };
-
-                reader.readAsText(file);
-            });
-        }
-
-        let accept = this.importMimeType;
-
-        if (!isBlank(accept) && file && accept.indexOf(file.type) === -1) {
-            return RSVP.reject(new UnsupportedMediaTypeError());
-        }
-
-        return RSVP.resolve();
-    }
-
-    @(task(function* (success) {
-        this.set('redirectSuccess', success);
-        this.set('redirectFailure', !success);
-
-        yield timeout(config.environment === 'test' ? 100 : 5000);
-
-        this.set('redirectSuccess', null);
-        this.set('redirectFailure', null);
-        return true;
-    }).drop())
-        redirectUploadResult;
-
-    @(task(function* (success) {
-        this.set('routesSuccess', success);
-        this.set('routesFailure', !success);
-
-        yield timeout(config.environment === 'test' ? 100 : 5000);
-
-        this.set('routesSuccess', null);
-        this.set('routesFailure', null);
-        return true;
-    }).drop())
-        routesUploadResult;
-
-    reset() {
-        this.set('importErrors', null);
-        this.set('importSuccessful', false);
-    }
-}
diff --git a/ghost/admin/app/controllers/settings/labs/import.js b/ghost/admin/app/controllers/settings/labs/import.js
deleted file mode 100644
index 51519f65114..00000000000
--- a/ghost/admin/app/controllers/settings/labs/import.js
+++ /dev/null
@@ -1,12 +0,0 @@
-import Controller from '@ember/controller';
-import {action} from '@ember/object';
-import {inject as service} from '@ember/service';
-
-export default class ImportController extends Controller {
-    @service router;
-
-    @action
-    close() {
-        this.router.transitionTo('settings.labs');
-    }
-}
diff --git a/ghost/admin/app/controllers/settings/membership.js b/ghost/admin/app/controllers/settings/membership.js
deleted file mode 100644
index 2074fb16184..00000000000
--- a/ghost/admin/app/controllers/settings/membership.js
+++ /dev/null
@@ -1,411 +0,0 @@
-import ConfirmUnsavedChangesModal from '../../components/modals/confirm-unsaved-changes';
-import Controller from '@ember/controller';
-import envConfig from 'ghost-admin/config/environment';
-import {action} from '@ember/object';
-import {currencies, getCurrencyOptions, getSymbol} from 'ghost-admin/utils/currency';
-import {inject} from 'ghost-admin/decorators/inject';
-import {inject as service} from '@ember/service';
-import {task} from 'ember-concurrency';
-import {tracked} from '@glimmer/tracking';
-
-const CURRENCIES = currencies.map((currency) => {
-    return {
-        value: currency.isoCode.toLowerCase(),
-        label: `${currency.isoCode} - ${currency.name}`,
-        isoCode: currency.isoCode
-    };
-});
-
-export default class MembersAccessController extends Controller {
-    @service feature;
-    @service membersUtils;
-    @service modals;
-    @service settings;
-    @service store;
-    @service session;
-
-    @inject config;
-
-    @tracked showPortalSettings = false;
-    @tracked showStripeConnect = false;
-    @tracked showTierModal = false;
-
-    @tracked tier = null;
-    @tracked tiers = null;
-    @tracked tierModel = null;
-    @tracked paidSignupRedirect;
-    @tracked freeSignupRedirect;
-    @tracked welcomePageURL;
-    @tracked stripeMonthlyAmount = 5;
-    @tracked stripeYearlyAmount = 50;
-    @tracked currency = 'usd';
-    @tracked stripePlanError = '';
-
-    @tracked portalPreviewUrl = '';
-
-    portalPreviewGuid = Date.now().valueOf();
-
-    queryParams = ['showPortalSettings', 'verifyEmail'];
-    @tracked verifyEmail = null;
-
-    get freeTier() {
-        return this.tiers?.find(tier => tier.type === 'free');
-    }
-
-    get paidTiers() {
-        return this.tiers?.filter(tier => tier.type === 'paid');
-    }
-
-    get allCurrencies() {
-        return getCurrencyOptions();
-    }
-
-    get siteUrl() {
-        return this.config.blogUrl;
-    }
-
-    get selectedCurrency() {
-        return CURRENCIES.findBy('value', this.currency);
-    }
-
-    get isConnectDisallowed() {
-        const siteUrl = this.config.blogUrl;
-        return envConfig.environment !== 'development' && !/^https:/.test(siteUrl);
-    }
-
-    get hasChangedPrices() {
-        if (this.tier) {
-            const monthlyPrice = this.tier.get('monthlyPrice');
-            const yearlyPrice = this.tier.get('yearlyPrice');
-
-            if (monthlyPrice?.amount && parseFloat(this.stripeMonthlyAmount) !== (monthlyPrice.amount / 100)) {
-                return true;
-            }
-            if (yearlyPrice?.amount && parseFloat(this.stripeYearlyAmount) !== (yearlyPrice.amount / 100)) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    @action
-    setup() {
-        this.fetchTiers.perform();
-        this.updatePortalPreview();
-    }
-
-    get isDirty() {
-        return this.settings.hasDirtyAttributes || this.hasChangedPrices;
-    }
-
-    @action
-    async membersSubscriptionAccessChanged() {
-        const oldValue = this.settings.changedAttributes().membersSignupAccess?.[0];
-
-        if (oldValue === 'none') {
-            // when saved value is 'none' the server won't inject the portal script
-            // to work around that and show the expected portal preview we save and
-            // force a refresh
-            await this.switchFromNoneTask.perform();
-        } else {
-            this.updatePortalPreview();
-        }
-    }
-
-    @action
-    setStripePlansCurrency(event) {
-        const newCurrency = event.value;
-        this.currency = newCurrency;
-    }
-
-    @action
-    setPaidSignupRedirect(url) {
-        this.paidSignupRedirect = url;
-    }
-
-    @action
-    setFreeSignupRedirect(url) {
-        this.freeSignupRedirect = url;
-    }
-
-    @action
-    setWelcomePageURL(url) {
-        this.welcomePageURL = url;
-    }
-
-    @action
-    validatePaidSignupRedirect() {
-        return this._validateSignupRedirect(this.paidSignupRedirect, 'membersPaidSignupRedirect');
-    }
-
-    @action
-    validateFreeSignupRedirect() {
-        return this._validateSignupRedirect(this.freeSignupRedirect, 'membersFreeSignupRedirect');
-    }
-
-    @action
-    validateWelcomePageURL() {
-        const siteUrl = this.siteUrl;
-
-        if (this.welcomePageURL === undefined) {
-            // Not initialised
-            return;
-        }
-
-        if (this.welcomePageURL.href.startsWith(siteUrl)) {
-            const path = this.welcomePageURL.href.replace(siteUrl, '');
-            this.freeTier.welcomePageURL = path;
-        } else {
-            this.freeTier.welcomePageURL = this.welcomePageURL.href;
-        }
-    }
-
-    @action
-    validateStripePlans({updatePortalPreview = true} = {}) {
-        this.stripePlanError = undefined;
-
-        try {
-            const yearlyAmount = this.stripeYearlyAmount;
-            const monthlyAmount = this.stripeMonthlyAmount;
-            const symbol = getSymbol(this.currency);
-            if (!yearlyAmount || yearlyAmount < 1 || !monthlyAmount || monthlyAmount < 1) {
-                throw new TypeError(`Subscription amount must be at least ${symbol}1.00`);
-            }
-
-            if (updatePortalPreview) {
-                this.updatePortalPreview();
-            }
-        } catch (err) {
-            this.stripePlanError = err.message;
-        }
-    }
-
-    @action
-    openStripeConnect() {
-        this.stripeEnabledOnOpen = this.membersUtils.isStripeEnabled;
-        this.showStripeConnect = true;
-    }
-
-    @action
-    async closeStripeConnect() {
-        if (this.stripeEnabledOnOpen !== this.membersUtils.isStripeEnabled) {
-            await this.saveSettingsTask.perform({forceRefresh: true});
-        }
-        this.showStripeConnect = false;
-    }
-
-    @action
-    async openEditTier(tier) {
-        this.tierModel = tier;
-        this.showTierModal = true;
-    }
-
-    @action
-    async openNewTier() {
-        this.tierModel = this.store.createRecord('tier');
-        this.showTierModal = true;
-    }
-
-    @action
-    closeTierModal() {
-        this.showTierModal = false;
-    }
-
-    @action
-    openPortalSettings() {
-        this.saveSettingsTask.perform();
-        this.showPortalSettings = true;
-    }
-
-    @action
-    async closePortalSettings() {
-        const changedAttributes = this.settings.changedAttributes();
-
-        if (changedAttributes && Object.keys(changedAttributes).length > 0) {
-            const shouldClose = await this.modals.open(ConfirmUnsavedChangesModal);
-
-            if (shouldClose) {
-                this.settings.rollbackAttributes();
-                this.showPortalSettings = false;
-                this.updatePortalPreview();
-            }
-        } else {
-            this.showPortalSettings = false;
-            this.updatePortalPreview();
-        }
-    }
-
-    @action
-    updatePortalPreview({forceRefresh} = {forceRefresh: false}) {
-        // TODO: can these be worked out from settings in membersUtils?
-        const monthlyPrice = Math.round(this.stripeMonthlyAmount * 100);
-        const yearlyPrice = Math.round(this.stripeYearlyAmount * 100);
-        let portalPlans = this.settings.portalPlans || [];
-
-        let isMonthlyChecked = portalPlans.includes('monthly');
-        let isYearlyChecked = portalPlans.includes('yearly');
-
-        const tiers = this.store.peekAll('tier');
-        const portalTiers = tiers?.filter((tier) => {
-            return tier.get('visibility') === 'public'
-                && tier.get('active') === true
-                && tier.get('type') === 'paid';
-        }).map((tier) => {
-            return tier.id;
-        });
-
-        const newUrl = new URL(this.membersUtils.getPortalPreviewUrl({
-            button: false,
-            monthlyPrice,
-            yearlyPrice,
-            portalTiers,
-            currency: this.currency,
-            isMonthlyChecked,
-            isYearlyChecked,
-            portalPlans: null
-        }));
-
-        if (forceRefresh) {
-            this.portalPreviewGuid = Date.now().valueOf();
-        }
-        newUrl.searchParams.set('v', this.portalPreviewGuid);
-
-        this.portalPreviewUrl = newUrl;
-    }
-
-    @action
-    portalPreviewInserted(iframe) {
-        this.portalPreviewIframe = iframe;
-
-        if (!this.portalMessageListener) {
-            this.portalMessageListener = (event) => {
-                // don't resize membership portal preview when events fire in customize portal modal
-                if (this.showPortalSettings) {
-                    return;
-                }
-
-                const resizeEvents = ['portal-ready', 'portal-preview-updated'];
-                if (resizeEvents.includes(event.data.type) && event.data.payload?.height && this.portalPreviewIframe?.parentNode) {
-                    this.portalPreviewIframe.parentNode.style.height = `${event.data.payload.height}px`;
-                }
-            };
-
-            window.addEventListener('message', this.portalMessageListener, true);
-        }
-    }
-
-    @action
-    portalPreviewDestroyed() {
-        this.portalPreviewIframe = null;
-
-        if (this.portalMessageListener) {
-            window.removeEventListener('message', this.portalMessageListener);
-        }
-    }
-
-    @action
-    confirmTierSave() {
-        this.updatePortalPreview({forceRefresh: true});
-        return this.fetchTiers.perform();
-    }
-
-    @task
-    *switchFromNoneTask() {
-        return yield this.saveSettingsTask.perform({forceRefresh: true});
-    }
-
-    setupPortalTier(tier) {
-        if (tier) {
-            const monthlyPrice = tier.get('monthlyPrice');
-            const yearlyPrice = tier.get('yearlyPrice');
-            this.currency = tier.get('currency');
-            if (monthlyPrice) {
-                this.stripeMonthlyAmount = (monthlyPrice / 100);
-            }
-            if (yearlyPrice) {
-                this.stripeYearlyAmount = (yearlyPrice / 100);
-            }
-            this.updatePortalPreview();
-        }
-    }
-
-    @task({drop: true})
-    *fetchTiers() {
-        this.tiers = yield this.store.query('tier', {
-            include: 'monthly_price,yearly_price,benefits'
-        });
-        this.tier = this.paidTiers.firstObject;
-        this.setupPortalTier(this.tier);
-    }
-
-    @task({drop: true})
-    *saveSettingsTask(options) {
-        if (this.settings.errors.length !== 0) {
-            return;
-        }
-        // When no filer is selected in `Specific tier(s)` option
-        if (!this.settings.defaultContentVisibility) {
-            return;
-        }
-        const result = yield this.settings.save();
-        yield this.freeTier.save();
-        this.updatePortalPreview(options);
-        return result;
-    }
-
-    async saveTier() {
-        const paidMembersEnabled = this.settings.paidMembersEnabled;
-        if (this.tier && paidMembersEnabled) {
-            const monthlyAmount = Math.round(this.stripeMonthlyAmount * 100);
-            const yearlyAmount = Math.round(this.stripeYearlyAmount * 100);
-
-            this.tier.set('monthlyPrice', monthlyAmount);
-            this.tier.set('yearlyPrice', yearlyAmount);
-
-            const savedTier = await this.tier.save();
-            return savedTier;
-        }
-    }
-
-    @action
-    reset() {
-        this.settings.rollbackAttributes();
-        this.resetPrices();
-        this.showLeavePortalModal = false;
-        this.showPortalSettings = false;
-    }
-
-    resetPrices() {
-        const monthlyPrice = this.tier.get('monthlyPrice');
-        const yearlyPrice = this.tier.get('yearlyPrice');
-
-        this.stripeMonthlyAmount = monthlyPrice ? (monthlyPrice.amount / 100) : 5;
-        this.stripeYearlyAmount = yearlyPrice ? (yearlyPrice.amount / 100) : 50;
-    }
-
-    _validateSignupRedirect(url, type) {
-        const siteUrl = this.config.blogUrl;
-        let errMessage = `Please enter a valid URL`;
-        this.settings.errors.remove(type);
-        this.settings.hasValidated.removeObject(type);
-
-        if (url === null) {
-            this.settings.errors.add(type, errMessage);
-            this.settings.hasValidated.pushObject(type);
-            return false;
-        }
-
-        if (url === undefined) {
-            // Not initialised
-            return;
-        }
-
-        if (url.href.startsWith(siteUrl)) {
-            const path = url.href.replace(siteUrl, '');
-            this.settings[type] = path;
-        } else {
-            this.settings[type] = url.href;
-        }
-    }
-}
diff --git a/ghost/admin/app/controllers/settings/navigation.js b/ghost/admin/app/controllers/settings/navigation.js
deleted file mode 100644
index 48b50a93204..00000000000
--- a/ghost/admin/app/controllers/settings/navigation.js
+++ /dev/null
@@ -1,146 +0,0 @@
-import Controller from '@ember/controller';
-import NavigationItem from 'ghost-admin/models/navigation-item';
-import RSVP from 'rsvp';
-import {action} from '@ember/object';
-import {inject} from 'ghost-admin/decorators/inject';
-import {inject as service} from '@ember/service';
-import {task} from 'ember-concurrency';
-import {tracked} from '@glimmer/tracking';
-
-export default class NavigationController extends Controller {
-    @service ghostPaths;
-    @service notifications;
-    @service session;
-    @service settings;
-
-    @inject config;
-
-    @tracked dirtyAttributes = false;
-    @tracked newNavItem = NavigationItem.create({isNew: true});
-    @tracked newSecondaryNavItem = NavigationItem.create({isNew: true, isSecondary: true});
-
-    get blogUrl() {
-        let url = this.config.blogUrl;
-
-        return url.slice(-1) !== '/' ? `${url}/` : url;
-    }
-
-    @action
-    save() {
-        this.saveTask.perform();
-    }
-
-    @action
-    addNavItem(item) {
-        // If the url sent through is blank (user never edited the url)
-        if (item.get('url') === '') {
-            item.set('url', '/');
-        }
-
-        return item.validate().then(() => {
-            this.addNewNavItem(item);
-        });
-    }
-
-    @action
-    deleteNavItem(item) {
-        if (!item) {
-            return;
-        }
-
-        let navItems = item.isSecondary ? this.settings.secondaryNavigation : this.settings.navigation;
-
-        navItems.removeObject(item);
-        this.dirtyAttributes = true;
-    }
-
-    @action
-    updateLabel(label, navItem) {
-        if (!navItem) {
-            return;
-        }
-
-        if (navItem.get('label') !== label) {
-            navItem.set('label', label);
-            this.dirtyAttributes = true;
-        }
-    }
-
-    @action
-    updateUrl(url, navItem) {
-        if (!navItem) {
-            return;
-        }
-
-        if (navItem.get('url') !== url) {
-            navItem.set('url', url);
-            this.dirtyAttributes = true;
-        }
-
-        return url;
-    }
-
-    @action
-    reset() {
-        this.newNavItem = NavigationItem.create({isNew: true});
-        this.newSecondaryNavItem = NavigationItem.create({isNew: true, isSecondary: true});
-    }
-
-    addNewNavItem(item) {
-        let navItems = item.isSecondary ? this.settings.secondaryNavigation : this.settings.navigation;
-
-        item.set('isNew', false);
-        navItems.pushObject(item);
-        this.dirtyAttributes = true;
-
-        if (item.isSecondary) {
-            this.newSecondaryNavItem = NavigationItem.create({isNew: true, isSecondary: true});
-        } else {
-            this.newNavItem = NavigationItem.create({isNew: true});
-        }
-    }
-
-    @task
-    *saveTask() {
-        let navItems = this.settings.navigation;
-        let secondaryNavItems = this.settings.secondaryNavigation;
-
-        let notifications = this.notifications;
-        let validationPromises = [];
-
-        if (!this.newNavItem.get('isBlank')) {
-            validationPromises.pushObject(this.send('addNavItem', this.newNavItem));
-        }
-
-        if (!this.newSecondaryNavItem.get('isBlank')) {
-            validationPromises.pushObject(this.send('addNavItem', this.newSecondaryNavItem));
-        }
-
-        navItems.forEach((item) => {
-            validationPromises.pushObject(item.validate());
-        });
-
-        secondaryNavItems.forEach((item) => {
-            validationPromises.pushObject(item.validate());
-        });
-
-        try {
-            yield RSVP.all(validationPromises);
-
-            // If some attributes have been changed, rebuild
-            // the model arrays or changes will not be detected
-            if (this.dirtyAttributes) {
-                this.settings.navigation = [...this.settings.navigation];
-                this.settings.secondaryNavigation = [...this.settings.secondaryNavigation];
-            }
-
-            this.dirtyAttributes = false;
-            return yield this.settings.save();
-        } catch (error) {
-            if (error) {
-                notifications.showAPIError(error);
-                throw error;
-            }
-        }
-    }
-}
diff --git a/ghost/admin/app/controllers/settings/newsletters.js b/ghost/admin/app/controllers/settings/newsletters.js
deleted file mode 100644
index 979694b0d3c..00000000000
--- a/ghost/admin/app/controllers/settings/newsletters.js
+++ /dev/null
@@ -1,18 +0,0 @@
-import Controller from '@ember/controller';
-import {inject as service} from '@ember/service';
-import {task} from 'ember-concurrency';
-import {tracked} from '@glimmer/tracking';
-
-export default class NewslettersController extends Controller {
-    @service settings;
-
-    queryParams = ['verifyEmail'];
-
-    @tracked verifyEmail = null;
-
-    @task({drop: true})
-    *saveSettings() {
-        const response = yield this.settings.save();
-        return response;
-    }
-}
diff --git a/ghost/admin/app/controllers/settings/staff/index.js b/ghost/admin/app/controllers/settings/staff/index.js
deleted file mode 100644
index 848af932ce4..00000000000
--- a/ghost/admin/app/controllers/settings/staff/index.js
+++ /dev/null
@@ -1,83 +0,0 @@
-import Controller from '@ember/controller';
-import RSVP from 'rsvp';
-import {action} from '@ember/object';
-import {inject as service} from '@ember/service';
-import {task} from 'ember-concurrency';
-import {tracked} from '@glimmer/tracking';
-
-export default class IndexController extends Controller {
-    @service session;
-    @service store;
-
-    @tracked showInviteUserModal = false;
-    @tracked showResetAllPasswordsModal = false;
-
-    inviteOrder = ['email'];
-    userOrder = ['name', 'email'];
-
-    allInvites = this.store.peekAll('invite');
-    allUsers = this.store.peekAll('user');
-
-    get currentUser() {
-        return this.model;
-    }
-
-    get invites() {
-        return this.allInvites
-            .filter(i => !i.isNew)
-            .sortBy(...this.inviteOrder);
-    }
-
-    get activeUsers() {
-        return this.allUsers
-            .filter(u => u.status !== 'inactive')
-            .sortBy(...this.userOrder);
-    }
-
-    get suspendedUsers() {
-        return this.allUsers
-            .filter(u => u.status === 'inactive')
-            .sortBy(...this.userOrder);
-    }
-
-    @action
-    toggleInviteUserModal() {
-        this.showInviteUserModal = !this.showInviteUserModal;
-    }
-
-    @action
-    toggleResetAllPasswordsModal() {
-        this.showResetAllPasswordsModal = !this.showResetAllPasswordsModal;
-    }
-
-    @task
-    *backgroundUpdateTask() {
-        let users = this.fetchUsersTask.perform();
-        let invites = this.fetchInvitesTask.perform();
-
-        try {
-            yield RSVP.all([users, invites]);
-        } catch (error) {
-            this.send('error', error);
-        }
-    }
-
-    @task
-    *fetchUsersTask() {
-        yield this.store.query('user', {limit: 'all'});
-    }
-
-    @task
-    *fetchInvitesTask() {
-        if (this.currentUser.isAuthorOrContributor) {
-            return;
-        }
-
-        // ensure roles are loaded before invites. Invites do not have embedded
-        // role records which means Ember Data will throw errors when trying to
-        // read the invite.role data when the role has not yet been loaded
-        yield this.store.query('role', {limit: 'all'});
-
-        return yield this.store.query('invite', {limit: 'all'});
-    }
-}
diff --git a/ghost/admin/app/controllers/settings/staff/user-loading.js b/ghost/admin/app/controllers/settings/staff/user-loading.js
deleted file mode 100644
index 79046d93edb..00000000000
--- a/ghost/admin/app/controllers/settings/staff/user-loading.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import Controller from '@ember/controller';
-import {inject as service} from '@ember/service';
-
-export default class StaffUserLoadingController extends Controller {
-    @service session;
-}
\ No newline at end of file
diff --git a/ghost/admin/app/controllers/settings/staff/user.js b/ghost/admin/app/controllers/settings/staff/user.js
deleted file mode 100644
index 0cd80509b59..00000000000
--- a/ghost/admin/app/controllers/settings/staff/user.js
+++ /dev/null
@@ -1,378 +0,0 @@
-import Controller from '@ember/controller';
-import DeleteUserModal from '../../../components/settings/staff/modals/delete-user';
-import RegenerateStaffTokenModal from '../../../components/settings/staff/modals/regenerate-staff-token';
-import SelectRoleModal from '../../../components/settings/staff/modals/select-role';
-import SuspendUserModal from '../../../components/settings/staff/modals/suspend-user';
-import TransferOwnershipModal from '../../../components/settings/staff/modals/transfer-ownership';
-import UnsuspendUserModal from '../../../components/settings/staff/modals/unsuspend-user';
-import UploadImageModal from '../../../components/settings/staff/modals/upload-image';
-import copyTextToClipboard from 'ghost-admin/utils/copy-text-to-clipboard';
-import isNumber from 'ghost-admin/utils/isNumber';
-import windowProxy from 'ghost-admin/utils/window-proxy';
-import {TrackedObject} from 'tracked-built-ins';
-import {action} from '@ember/object';
-import {inject} from 'ghost-admin/decorators/inject';
-import {run} from '@ember/runloop';
-import {inject as service} from '@ember/service';
-import {task, taskGroup, timeout} from 'ember-concurrency';
-import {tracked} from '@glimmer/tracking';
-
-export default class UserController extends Controller {
-    @service ajax;
-    @service ghostPaths;
-    @service membersUtils;
-    @service modals;
-    @service notifications;
-    @service session;
-    @service slugGenerator;
-    @service utils;
-
-    @inject config;
-
-    @tracked dirtyAttributes = false;
-    @tracked personalToken = null;
-    @tracked personalTokenRegenerated = false;
-    @tracked scratchValues = new TrackedObject();
-    @tracked slugValue = null; // not set directly on model to avoid URL changing before save
-
-    get user() {
-        return this.model;
-    }
-
-    get currentUser() {
-        return this.session.user;
-    }
-
-    get isOwnProfile() {
-        return this.currentUser.id === this.user.id;
-    }
-
-    get isAdminUserOnOwnProfile() {
-        return this.currentUser.isAdminOnly && this.isOwnProfile;
-    }
-
-    get isAdminUserOnOwnerProfile() {
-        return this.currentUser.isAdminOnly && this.user.isOwnerOnly;
-    }
-
-    get canChangeEmail() {
-        return !this.isAdminUserOnOwnerProfile;
-    }
-
-    get canChangePassword() {
-        return !this.isAdminUserOnOwnerProfile;
-    }
-
-    get canMakeOwner() {
-        return this.currentUser.isOwnerOnly
-            && !this.isOwnProfile
-            && this.user.isAdminOnly
-            && !this.user.isSuspended;
-    }
-
-    get canToggleMemberAlerts() {
-        return this.currentUser.isOwnerOnly || this.isAdminUserOnOwnProfile;
-    }
-
-    get rolesDropdownIsVisible() {
-        return this.currentUser.isAdmin && !this.isOwnProfile && !this.user.isOwnerOnly;
-    }
-
-    get userActionsAreVisible() {
-        return this.deleteUserActionIsVisible || this.canMakeOwner;
-    }
-
-    get deleteUserActionIsVisible() {
-        // users can't delete themselves
-        if (this.isOwnProfile) {
-            return false;
-        }
-
-        if (
-            // owners/admins can delete any non-owner user
-            (this.currentUser.isAdmin && !this.user.isOwnerOnly) ||
-            // editors can delete any author or contributor
-            (this.currentUser.isEditor && this.user.isAuthorOrContributor)
-        ) {
-            return true;
-        }
-
-        return false;
-    }
-
-    @action
-    setModelProperty(property, event) {
-        const value = event.target.value;
-        this.user[property] = value;
-    }
-
-    @action
-    validateModelProperty(property) {
-        this.user.validate({property});
-    }
-
-    @action
-    clearModelErrors(property) {
-        this.user.hasValidated.removeObject(property);
-        this.user.errors.remove(property);
-    }
-
-    @action
-    setSlugValue(event) {
-        this.slugValue = event.target.value;
-    }
-
-    @action
-    async deleteUser() {
-        await this.modals.open(DeleteUserModal, {
-            user: this.model
-        });
-    }
-
-    @action
-    async suspendUser() {
-        await this.modals.open(SuspendUserModal, {
-            user: this.model,
-            saveTask: this.saveTask
-        });
-    }
-
-    @action
-    async unsuspendUser() {
-        await this.modals.open(UnsuspendUserModal, {
-            user: this.model,
-            saveTask: this.saveTask
-        });
-    }
-
-    @action
-    async transferOwnership() {
-        await this.modals.open(TransferOwnershipModal, {
-            user: this.model
-        });
-    }
-
-    @action
-    async regenerateStaffToken() {
-        const apiToken = await this.modals.open(RegenerateStaffTokenModal);
-
-        if (apiToken) {
-            this.personalToken = apiToken;
-            this.personalTokenRegenerated = true;
-        }
-    }
-
-    @action
-    async selectRole() {
-        const newRole = await this.modals.open(SelectRoleModal, {
-            currentRole: this.model.role
-        });
-
-        if (newRole) {
-            this.user.role = newRole;
-            this.dirtyAttributes = true;
-        }
-    }
-
-    @action
-    async changeCoverImage() {
-        await this.modals.open(UploadImageModal, {
-            model: this.model,
-            modelProperty: 'coverImage'
-        });
-    }
-
-    @action
-    async changeProfileImage() {
-        await this.modals.open(UploadImageModal, {
-            model: this.model,
-            modelProperty: 'profileImage'
-        });
-    }
-
-    @action
-    setScratchValue(property, value) {
-        this.scratchValues[property] = value;
-    }
-
-    @action
-    reset() {
-        this.user.rollbackAttributes();
-        this.user.password = '';
-        this.user.newPassword = '';
-        this.user.ne2Password = '';
-        this.slugValue = this.user.slug;
-        this.dirtyAttributes = false;
-        this.clearScratchValues();
-    }
-
-    @action
-    toggleCommentNotifications(event) {
-        this.user.commentNotifications = event.target.checked;
-    }
-
-    @action
-    toggleMentionNotifications(event) {
-        this.user.mentionNotifications = event.target.checked;
-    }
-
-    @action
-    toggleMilestoneNotifications(event) {
-        this.user.milestoneNotifications = event.target.checked;
-    }
-
-    @action
-    toggleDonationNotifications(event) {
-        this.user.donationNotifications = event.target.checked;
-    }
-
-    @action
-    toggleMemberEmailAlerts(type, event) {
-        if (type === 'free-signup') {
-            this.user.freeMemberSignupNotification = event.target.checked;
-        } else if (type === 'paid-started') {
-            this.user.paidSubscriptionStartedNotification = event.target.checked;
-        } else if (type === 'paid-canceled') {
-            this.user.paidSubscriptionCanceledNotification = event.target.checked;
-        }
-    }
-
-    @taskGroup({enqueue: true}) saveHandlers;
-
-    @task({group: 'saveHandlers'})
-    *updateSlugTask(event) {
-        let newSlug = event.target.value;
-        let slug = this.user.slug;
-
-        newSlug = newSlug || slug;
-        newSlug = newSlug.trim();
-
-        // Ignore unchanged slugs or candidate slugs that are empty
-        if (!newSlug || slug === newSlug) {
-            this.slugValue = slug;
-
-            return true;
-        }
-
-        let serverSlug = yield this.slugGenerator.generateSlug('user', newSlug);
-
-        // If after getting the sanitized and unique slug back from the API
-        // we end up with a slug that matches the existing slug, abort the change
-        if (serverSlug === slug) {
-            return true;
-        }
-
-        // Because the server transforms the candidate slug by stripping
-        // certain characters and appending a number onto the end of slugs
-        // to enforce uniqueness, there are cases where we can get back a
-        // candidate slug that is a duplicate of the original except for
-        // the trailing incrementor (e.g., this-is-a-slug and this-is-a-slug-2)
-
-        // get the last token out of the slug candidate and see if it's a number
-        let slugTokens = serverSlug.split('-');
-        let check = Number(slugTokens.pop());
-
-        // if the candidate slug is the same as the existing slug except
-        // for the incrementor then the existing slug should be used
-        if (isNumber(check) && check > 0) {
-            if (slug === slugTokens.join('-') && serverSlug !== newSlug) {
-                this.slugValue = slug;
-
-                return true;
-            }
-        }
-
-        this.slugValue = serverSlug;
-        this.dirtyAttributes = true;
-
-        return true;
-    }
-
-    @task({group: 'saveHandlers'})
-    *saveTask() {
-        let user = this.user;
-        let slugValue = this.slugValue;
-        let slugChanged;
-
-        if (user.slug !== slugValue) {
-            slugChanged = true;
-            user.slug = slugValue;
-        }
-
-        try {
-            user = yield user.save();
-
-            this.clearScratchValues();
-
-            // If the user's slug has changed, change the URL and replace
-            // the history so refresh and back button still work
-            if (slugChanged) {
-                let currentPath = window.location.hash;
-
-                let newPath = currentPath.split('/');
-                newPath[newPath.length - 1] = user.get('slug');
-                newPath = newPath.join('/');
-
-                windowProxy.replaceState({path: newPath}, '', newPath);
-            }
-
-            this.dirtyAttributes = false;
-            this.notifications.closeAlerts('user.update');
-
-            return user;
-        } catch (error) {
-            // validation engine returns undefined so we have to check
-            // before treating the failure as an API error
-            if (error) {
-                this.notifications.showAPIError(error, {key: 'user.update'});
-            }
-        }
-    }
-
-    @task
-    *saveNewPasswordTask() {
-        try {
-            const user = yield this.user.saveNewPasswordTask.perform();
-            document.querySelector('#password-reset')?.reset();
-            return user;
-        } catch (error) {
-            if (error) {
-                this.notifications.showAPIError(error, {key: 'user.update'});
-            }
-        }
-    }
-
-    @action
-    submitPasswordForm(event) {
-        event.preventDefault();
-        this._blurAndTrigger(() => this.saveNewPasswordTask.perform());
-    }
-
-    @action
-    saveViaKeyboard(event) {
-        event.preventDefault();
-        this._blurAndTrigger(() => this.saveTask.perform());
-    }
-
-    @task
-    *copyContentKeyTask() {
-        copyTextToClipboard(this.personalToken);
-        yield timeout(this.isTesting ? 50 : 3000);
-    }
-
-    clearScratchValues() {
-        this.scratchValues = new TrackedObject();
-    }
-
-    _blurAndTrigger(fn) {
-        // trigger any set-on-blur actions
-        const focusedElement = document.activeElement;
-        focusedElement?.blur();
-
-        // schedule save for when set-on-blur actions have finished
-        run.schedule('actions', this, function () {
-            focusedElement?.focus();
-            fn();
-        });
-    }
-}
diff --git a/ghost/admin/app/controllers/settings/tier.js b/ghost/admin/app/controllers/settings/tier.js
deleted file mode 100644
index 9785de54730..00000000000
--- a/ghost/admin/app/controllers/settings/tier.js
+++ /dev/null
@@ -1,208 +0,0 @@
-import Controller from '@ember/controller';
-import EmberObject, {action} from '@ember/object';
-import {inject} from 'ghost-admin/decorators/inject';
-import {inject as service} from '@ember/service';
-import {task} from 'ember-concurrency';
-import {tracked} from '@glimmer/tracking';
-
-export default class TierController extends Controller {
-    @service membersUtils;
-    @service settings;
-
-    @inject config;
-
-    @tracked showLeaveSettingsModal = false;
-    @tracked showPriceModal = false;
-    @tracked priceModel = null;
-    @tracked showUnsavedChangesModal = false;
-    @tracked paidSignupRedirect;
-
-    get siteUrl() {
-        return this.config.blogUrl;
-    }
-
-    get tier() {
-        return this.model;
-    }
-
-    get stripePrices() {
-        const stripePrices = this.model.stripePrices || [];
-        return stripePrices.map((d) => {
-            return {
-                ...d,
-                amount: d.amount / 100
-            };
-        }).sort((a, b) => {
-            return a.amount - b.amount;
-        }).sort((a, b) => {
-            return a.currency.localeCompare(b.currency, undefined, {ignorePunctuation: true});
-        }).sort((a, b) => {
-            return (a.active === b.active) ? 0 : (a.active ? -1 : 1);
-        });
-    }
-
-    get noOfPrices() {
-        return (this.tier.stripePrices || []).length;
-    }
-
-    @action
-    toggleUnsavedChangesModal(transition) {
-        let leaveTransition = this.leaveScreenTransition;
-
-        if (!transition && this.showUnsavedChangesModal) {
-            this.leaveScreenTransition = null;
-            this.showUnsavedChangesModal = false;
-            return;
-        }
-
-        if (!leaveTransition || transition.targetName === leaveTransition.targetName) {
-            this.leaveScreenTransition = transition;
-
-            // if a save is running, wait for it to finish then transition
-            if (this.saveTask.isRunning) {
-                return this.saveTask.last.then(() => {
-                    transition.retry();
-                });
-            }
-
-            // we genuinely have unsaved data, show the modal
-            this.showUnsavedChangesModal = true;
-        }
-    }
-
-    @action
-    leaveScreen() {
-        this.tier.rollbackAttributes();
-        return this.leaveScreenTransition.retry();
-    }
-
-    @action
-    async openEditPrice(price) {
-        this.priceModel = price;
-        this.showPriceModal = true;
-    }
-
-    @action
-    async openNewPrice() {
-        this.priceModel = null;
-        this.showPriceModal = true;
-    }
-
-    @action
-    async archivePrice(price) {
-        price.active = false;
-        price.amount = price.amount * 100;
-        this.send('savePrice', price);
-    }
-
-    @action
-    async activatePrice(price) {
-        price.active = true;
-        price.amount = price.amount * 100;
-        this.send('savePrice', price);
-    }
-
-    @action
-    openStripeConnect() {
-        alert('Update to use stripe-connect modal (see memberships screen)');
-    }
-
-    @action
-    async confirmLeave() {
-        this.settings.rollbackAttributes();
-        this.showLeaveSettingsModal = false;
-        this.leaveSettingsTransition.retry();
-    }
-
-    @action
-    cancelLeave() {
-        this.showLeaveSettingsModal = false;
-        this.leaveSettingsTransition = null;
-    }
-
-    @action
-    save() {
-        return this.saveTask.perform();
-    }
-
-    @action
-    savePrice(price) {
-        const stripePrices = this.tier.stripePrices.map((d) => {
-            if (d.id === price.id) {
-                return EmberObject.create({
-                    ...price,
-                    active: !!price.active
-                });
-            }
-            return {
-                ...d,
-                active: !!d.active
-            };
-        });
-        if (!price.id) {
-            stripePrices.push(EmberObject.create({
-                ...price,
-                active: !!price.active
-            }));
-        }
-        this.tier.set('stripePrices', stripePrices);
-        this.saveTask.perform();
-    }
-
-    @action
-    closePriceModal() {
-        this.showPriceModal = false;
-    }
-
-    @action
-    setPaidSignupRedirect(url) {
-        this.paidSignupRedirect = url;
-    }
-
-    @action
-    validatePaidSignupRedirect() {
-        return this._validateSignupRedirect(this.paidSignupRedirect, 'membersPaidSignupRedirect');
-    }
-
-    @task({restartable: true})
-    *saveTask() {
-        this.send('validatePaidSignupRedirect');
-        this.tier.validate();
-        if (this.tier.get('errors').length !== 0) {
-            return;
-        }
-        if (this.settings.errors.length !== 0) {
-            return;
-        }
-        yield this.settings.save();
-        const response = yield this.tier.save();
-        if (this.showPriceModal) {
-            this.closePriceModal();
-        }
-        return response;
-    }
-
-    _validateSignupRedirect(url, type) {
-        let errMessage = `Please enter a valid URL`;
-        this.settings.errors.remove(type);
-        this.settings.hasValidated.removeObject(type);
-
-        if (url === null) {
-            this.settings.errors.add(type, errMessage);
-            this.settings.hasValidated.pushObject(type);
-            return false;
-        }
-
-        if (url === undefined) {
-            // Not initialised
-            return;
-        }
-
-        if (url.href.startsWith(this.siteUrl)) {
-            const path = url.href.replace(this.siteUrl, '');
-            this.settings[type] = path;
-        } else {
-            this.settings[type] = url.href;
-        }
-    }
-}
diff --git a/ghost/admin/app/controllers/settings/tiers.js b/ghost/admin/app/controllers/settings/tiers.js
deleted file mode 100644
index acd28e55c35..00000000000
--- a/ghost/admin/app/controllers/settings/tiers.js
+++ /dev/null
@@ -1,38 +0,0 @@
-import Controller from '@ember/controller';
-import {action} from '@ember/object';
-import {htmlSafe} from '@ember/template';
-import {inject} from 'ghost-admin/decorators/inject';
-import {inject as service} from '@ember/service';
-import {tracked} from '@glimmer/tracking';
-
-export default class TiersController extends Controller {
-    @service settings;
-
-    @inject config;
-
-    @tracked iconStyle = '';
-    @tracked showFreeMembershipModal = false;
-
-    constructor() {
-        super(...arguments);
-        this.iconStyle = this.setIconStyle();
-    }
-
-    get tiers() {
-        return this.model.sortBy('name');
-    }
-
-    setIconStyle() {
-        let icon = this.config.icon;
-        if (icon) {
-            return htmlSafe(`background-image: url(${icon})`);
-        }
-        icon = 'https://static.ghost.org/v4.0.0/images/ghost-orb-2.png';
-        return htmlSafe(`background-image: url(${icon})`);
-    }
-
-    @action
-    closeFreeMembershipModal() {
-        this.showFreeMembershipModal = false;
-    }
-}
diff --git a/ghost/admin/app/helpers/parse-member-event.js b/ghost/admin/app/helpers/parse-member-event.js
index ddf8369d0be..f0581eb3b6c 100644
--- a/ghost/admin/app/helpers/parse-member-event.js
+++ b/ghost/admin/app/helpers/parse-member-event.js
@@ -220,7 +220,7 @@ export default class ParseMemberEventHelper extends Helper {
      *   object: 'My blog post'
      * When both words need to get appended, we'll add 'on'
      *  -> do this by returning 'on' in getJoin()
-     * This string is not added when action and object are in a separete table column, or when the getObject/getURL is empty
+     * This string is not added when action and object are in a separate table column, or when the getObject/getURL is empty
      */
     getJoin() {
         return '–';
diff --git a/ghost/admin/app/helpers/set-query-params.js b/ghost/admin/app/helpers/set-query-params.js
index cee3f6ebd45..d0380aa0889 100644
--- a/ghost/admin/app/helpers/set-query-params.js
+++ b/ghost/admin/app/helpers/set-query-params.js
@@ -9,7 +9,7 @@ import {helper} from '@ember/component/helper';
  * 
  * This example will return https://myurl.com?utm_source=admin
  * 
- * You can set every query/search parameter you want. It will override existing paramters if they are already set.
+ * You can set every query/search parameter you want. It will override existing parameters if they are already set.
  */
 export function setQueryParams([url], parameters) {
     if (url) {
diff --git a/ghost/admin/app/models/post.js b/ghost/admin/app/models/post.js
index 9f6ec1bccb1..3cbc4b01a73 100644
--- a/ghost/admin/app/models/post.js
+++ b/ghost/admin/app/models/post.js
@@ -136,10 +136,6 @@ export default Model.extend(Comparable, ValidationEngine, {
     lexicalScratch: null,
     titleScratch: null,
 
-    // HACK: used for validation so that date/time can be validated based on
-    // eventual status rather than current status
-    statusScratch: null,
-
     // For use by date/time pickers - will be validated then converted to UTC
     // on save. Updated by an observer whenever publishedAtUTC changes.
     // Everything that revolves around publishedAtUTC only cares about the saved
diff --git a/ghost/admin/app/routes/application.js b/ghost/admin/app/routes/application.js
index c64ee527288..628fe2af4ca 100644
--- a/ghost/admin/app/routes/application.js
+++ b/ghost/admin/app/routes/application.js
@@ -92,7 +92,6 @@ export default Route.extend(ShortcutsRoute, {
             // Need a tiny delay here to allow the router to update to the current route
             later(() => {
                 Sentry.setTag('route', this.router.currentRouteName);
-                Sentry.setTag('path', this.router.currentURL);
             }, 2);
         },
 
@@ -181,10 +180,32 @@ export default Route.extend(ShortcutsRoute, {
                 dsn: this.config.sentry_dsn,
                 environment: this.config.sentry_env,
                 release: `ghost@${this.config.version}`,
-                beforeSend(event) {
+                beforeSend(event, hint) {
+                    const exception = hint.originalException;
                     event.tags = event.tags || {};
                     event.tags.shown_to_user = event.tags.shown_to_user || false;
                     event.tags.grammarly = !!document.querySelector('[data-gr-ext-installed]');
+
+                    // Do not report "handled" errors to Sentry
+                    if (event.tags.shown_to_user === true) {
+                        return null;
+                    }
+
+                    // ajax errors — improve logging and add context for debugging
+                    if (isAjaxError(exception)) {
+                        const error = exception.payload.errors[0];
+                        event.exception.values[0].type = `${error.type}: ${error.context}`;
+                        event.exception.values[0].value = error.message;
+                        event.exception.values[0].context = error.context;
+                        event.tags.isAjaxError = true;
+                    } else {
+                        event.tags.isAjaxError = false;
+                        delete event.contexts.ajax;
+                        delete event.tags.ajaxStatus;
+                        delete event.tags.ajaxMethod;
+                        delete event.tags.ajaxUrl;
+                    }
+
                     return event;
                 },
                 // TransitionAborted errors surface from normal application behaviour
diff --git a/ghost/admin/app/routes/settings.js b/ghost/admin/app/routes/settings.js
deleted file mode 100644
index 75508ef2266..00000000000
--- a/ghost/admin/app/routes/settings.js
+++ /dev/null
@@ -1,16 +0,0 @@
-import AuthenticatedRoute from 'ghost-admin/routes/authenticated';
-import {inject as service} from '@ember/service';
-
-export default class SettingsRoute extends AuthenticatedRoute {
-    @service session;
-
-    beforeModel() {
-        super.beforeModel(...arguments);
-
-        const user = this.session.user;
-
-        if (!user.isAdmin) {
-            return this.transitionTo('settings.staff.user', user);
-        }
-    }
-}
diff --git a/ghost/admin/app/routes/settings/analytics.js b/ghost/admin/app/routes/settings/analytics.js
deleted file mode 100644
index 6f1a3d55d86..00000000000
--- a/ghost/admin/app/routes/settings/analytics.js
+++ /dev/null
@@ -1,75 +0,0 @@
-import AdminRoute from 'ghost-admin/routes/admin';
-import ConfirmUnsavedChangesModal from '../../components/modals/confirm-unsaved-changes';
-import RSVP from 'rsvp';
-import {action} from '@ember/object';
-import {inject} from 'ghost-admin/decorators/inject';
-import {inject as service} from '@ember/service';
-
-export default class AnalyticsSettingsRoute extends AdminRoute {
-    @service modals;
-    @service settings;
-
-    @inject config;
-
-    model() {
-        return RSVP.hash({
-            settings: this.settings.reload()
-        });
-    }
-
-    deactivate() {
-        this.confirmModal = null;
-        this.hasConfirmed = false;
-    }
-
-    @action
-    async willTransition(transition) {
-        if (this.hasConfirmed) {
-            return true;
-        }
-
-        transition.abort();
-
-        // wait for any existing confirm modal to be closed before allowing transition
-        if (this.confirmModal) {
-            return;
-        }
-
-        if (this.controller.saveTask?.isRunning) {
-            await this.controller.saveTask.last;
-        }
-
-        const shouldLeave = await this.confirmUnsavedChanges();
-
-        if (shouldLeave) {
-            this.settings.rollbackAttributes();
-            this.hasConfirmed = true;
-            return transition.retry();
-        }
-    }
-
-    async confirmUnsavedChanges() {
-        if (this.settings.hasDirtyAttributes) {
-            this.confirmModal = this.modals
-                .open(ConfirmUnsavedChangesModal)
-                .finally(() => {
-                    this.confirmModal = null;
-                });
-
-            return this.confirmModal;
-        }
-
-        return true;
-    }
-
-    @action
-    reloadSettings() {
-        return this.settings.reload();
-    }
-
-    buildRouteInfoMetadata() {
-        return {
-            titleToken: 'Settings - Analytics'
-        };
-    }
-}
diff --git a/ghost/admin/app/routes/settings/announcement-bar.js b/ghost/admin/app/routes/settings/announcement-bar.js
deleted file mode 100644
index c8d97230b23..00000000000
--- a/ghost/admin/app/routes/settings/announcement-bar.js
+++ /dev/null
@@ -1,93 +0,0 @@
-import AdminRoute from 'ghost-admin/routes/authenticated';
-import ConfirmUnsavedChangesModal from '../../components/modals/confirm-unsaved-changes';
-import {action} from '@ember/object';
-import {inject as service} from '@ember/service';
-
-export default class AnnouncementBarRoute extends AdminRoute {
-    @service customThemeSettings;
-    @service feature;
-    @service modals;
-    @service settings;
-    @service themeManagement;
-    @service ui;
-    @service session;
-    @service store;
-
-    model() {
-        // background refresh of preview
-        // not doing it on the 'index' route so that we don't reload going to/from the index,
-        // any actions performed on child routes that need a refresh should trigger it explicitly
-        this.themeManagement.updatePreviewHtmlTask.perform();
-
-        // wait for settings to be loaded - we need the data to be present before display
-        return Promise.all([
-            this.settings.reload(),
-            this.customThemeSettings.load(),
-            this.store.findAll('theme')
-        ]);
-    }
-
-    beforeModel() {
-        super.beforeModel(...arguments);
-
-        const user = this.session.user;
-
-        if (!user.isAdmin) {
-            return this.transitionTo('settings.staff.user', user);
-        }
-    }
-
-    activate() {
-        this.ui.contextualNavMenu = 'announcement-bar';
-    }
-
-    deactivate() {
-        this.ui.contextualNavMenu = null;
-        this.confirmModal = null;
-        this.hasConfirmed = false;
-    }
-
-    buildRouteInfoMetadata() {
-        return {
-            titleToken: 'Settings - Announcement bar',
-            mainClasses: ['gh-main-fullwidth']
-        };
-    }
-
-    @action
-    willTransition(transition) {
-        if (this.hasConfirmed) {
-            return true;
-        }
-
-        // always abort when not confirmed because Ember's router doesn't automatically wait on promises
-        transition.abort();
-
-        this.confirmUnsavedChanges().then((shouldLeave) => {
-            if (shouldLeave === true) {
-                this.hasConfirmed = true;
-                return transition.retry();
-            }
-        });
-    }
-
-    confirmUnsavedChanges() {
-        if (!this.settings.hasDirtyAttributes) {
-            return Promise.resolve(true);
-        }
-
-        if (!this.confirmModal) {
-            this.confirmModal = this.modals.open(ConfirmUnsavedChangesModal)
-                .then((discardChanges) => {
-                    if (discardChanges === true) {
-                        this.settings.rollbackAttributes();
-                    }
-                    return discardChanges;
-                }).finally(() => {
-                    this.confirmModal = null;
-                });
-        }
-
-        return this.confirmModal;
-    }
-}
diff --git a/ghost/admin/app/routes/settings/code-injection.js b/ghost/admin/app/routes/settings/code-injection.js
deleted file mode 100644
index 82717c13630..00000000000
--- a/ghost/admin/app/routes/settings/code-injection.js
+++ /dev/null
@@ -1,71 +0,0 @@
-import AdminRoute from 'ghost-admin/routes/admin';
-import ConfirmUnsavedChangesModal from '../../components/modals/confirm-unsaved-changes';
-import {action} from '@ember/object';
-import {inject as service} from '@ember/service';
-
-export default class CodeInjectionRoute extends AdminRoute {
-    @service modals;
-    @service settings;
-
-    model() {
-        return this.settings.reload();
-    }
-
-    deactivate() {
-        this.confirmModal = null;
-        this.hasConfirmed = false;
-    }
-
-    @action
-    async willTransition(transition) {
-        if (this.hasConfirmed) {
-            return true;
-        }
-
-        transition.abort();
-
-        // wait for any existing confirm modal to be closed before allowing transition
-        if (this.confirmModal) {
-            return;
-        }
-
-        if (this.controller.saveTask?.isRunning) {
-            await this.controller.saveTask.last;
-        }
-
-        const shouldLeave = await this.confirmUnsavedChanges();
-
-        if (shouldLeave) {
-            this.settings.rollbackAttributes();
-            this.hasConfirmed = true;
-            return transition.retry();
-        }
-    }
-
-    async confirmUnsavedChanges() {
-        const settings = this.settings;
-
-        if (settings.hasDirtyAttributes) {
-            this.confirmModal = this.modals
-                .open(ConfirmUnsavedChangesModal)
-                .finally(() => {
-                    this.confirmModal = null;
-                });
-
-            return this.confirmModal;
-        }
-
-        return true;
-    }
-
-    @action
-    save() {
-        this.controller.send('save');
-    }
-
-    buildRouteInfoMetadata() {
-        return {
-            titleToken: 'Settings - Code injection'
-        };
-    }
-}
diff --git a/ghost/admin/app/routes/settings/design.js b/ghost/admin/app/routes/settings/design.js
deleted file mode 100644
index 1392502a492..00000000000
--- a/ghost/admin/app/routes/settings/design.js
+++ /dev/null
@@ -1,52 +0,0 @@
-import AdminRoute from 'ghost-admin/routes/authenticated';
-import {inject as service} from '@ember/service';
-
-export default class SettingsDesignRoute extends AdminRoute {
-    @service customThemeSettings;
-    @service feature;
-    @service modals;
-    @service settings;
-    @service themeManagement;
-    @service ui;
-    @service session;
-    @service store;
-
-    model() {
-        // background refresh of preview
-        // not doing it on the 'index' route so that we don't reload going to/from the index,
-        // any actions performed on child routes that need a refresh should trigger it explicitly
-        this.themeManagement.updatePreviewHtmlTask.perform();
-
-        // wait for settings to be loaded - we need the data to be present before display
-        return Promise.all([
-            this.settings.reload(),
-            this.customThemeSettings.load(),
-            this.store.findAll('theme')
-        ]);
-    }
-
-    beforeModel() {
-        super.beforeModel(...arguments);
-
-        const user = this.session.user;
-
-        if (!user.isAdmin) {
-            return this.transitionTo('settings.staff.user', user);
-        }
-    }
-
-    activate() {
-        this.ui.contextualNavMenu = 'design';
-    }
-
-    deactivate() {
-        this.ui.contextualNavMenu = null;
-    }
-
-    buildRouteInfoMetadata() {
-        return {
-            titleToken: 'Settings - Design',
-            mainClasses: ['gh-main-fullwidth']
-        };
-    }
-}
diff --git a/ghost/admin/app/routes/settings/design/change-theme.js b/ghost/admin/app/routes/settings/design/change-theme.js
deleted file mode 100644
index f218ac04518..00000000000
--- a/ghost/admin/app/routes/settings/design/change-theme.js
+++ /dev/null
@@ -1,16 +0,0 @@
-import AdminRoute from 'ghost-admin/routes/admin';
-import {action} from '@ember/object';
-import {inject as service} from '@ember/service';
-
-export default class ChangeThemeRoute extends AdminRoute {
-    @service store;
-
-    model() {
-        return this.store.findAll('theme');
-    }
-
-    @action
-    willTransition() {
-        this.controllerFor('settings.design.change-theme').reset();
-    }
-}
diff --git a/ghost/admin/app/routes/settings/design/change-theme/install.js b/ghost/admin/app/routes/settings/design/change-theme/install.js
deleted file mode 100644
index 3d896b387f6..00000000000
--- a/ghost/admin/app/routes/settings/design/change-theme/install.js
+++ /dev/null
@@ -1,55 +0,0 @@
-import AdminRoute from 'ghost-admin/routes/admin';
-import InstallThemeModal from '../../../../components/modals/design/install-theme';
-import {action} from '@ember/object';
-import {inject as service} from '@ember/service';
-
-export default class InstallThemeRoute extends AdminRoute {
-    @service modals;
-    @service router;
-
-    redirect(model, transition) {
-        const {source, ref} = transition.to.queryParams || {};
-
-        if (!source || !ref) {
-            this.transitionTo('settings.design.change-theme');
-        }
-    }
-
-    // use `didTransition` rather than `activate` so that controller setup has completed
-    @action
-    didTransition() {
-        const installController = this.controllerFor('settings.design.change-theme.install');
-        const themesController = this.controllerFor('settings.design.change-theme');
-
-        const theme = themesController.officialThemes.findBy('ref', installController.ref);
-
-        this.installModal = this.modals.open(InstallThemeModal, {
-            theme,
-            ref: installController.ref,
-            onSuccess: () => {
-                this.showingSuccessModal = true;
-                this.router.transitionTo('settings.design');
-            }
-        }, {
-            beforeClose: this.beforeModalClose
-        });
-    }
-
-    deactivate() {
-        // leave install modal visible if it's in the success state because
-        // we're switching over to the design customisation screen in the bg
-        // and don't want to auto-close when this modal closes
-        if (this.installModal && !this.showingSuccessModal) {
-            this.installModal.close();
-        }
-    }
-
-    @action
-    beforeModalClose() {
-        if (!this.showingSuccessModal) {
-            this.transitionTo('settings.design.change-theme');
-        }
-        this.showingSuccessModal = false;
-        this.installModal = null;
-    }
-}
diff --git a/ghost/admin/app/routes/settings/design/change-theme/view.js b/ghost/admin/app/routes/settings/design/change-theme/view.js
deleted file mode 100644
index 70f8c0ce6cb..00000000000
--- a/ghost/admin/app/routes/settings/design/change-theme/view.js
+++ /dev/null
@@ -1,49 +0,0 @@
-import AdminRoute from 'ghost-admin/routes/admin';
-import ViewThemeModal from 'ghost-admin/components/modals/design/view-theme';
-import {action} from '@ember/object';
-import {inject as service} from '@ember/service';
-
-export default class ViewThemeRoute extends AdminRoute {
-    @service modals;
-
-    themeModal = null;
-
-    model(params, transition) {
-        const changeThemeController = this.controllerFor('settings.design.change-theme');
-        const knownThemes = changeThemeController.officialThemes;
-
-        const foundTheme = knownThemes.find(theme => theme.name === params.theme_name);
-
-        if (foundTheme) {
-            return foundTheme;
-        }
-
-        const path = transition.intent.url.replace(/^\//, '');
-        return this.replaceWith('error404', {path, status: 404});
-    }
-
-    setupController(controller, model) {
-        this.themeModal?.close();
-
-        this.themeModal = this.modals.open(ViewThemeModal, {
-            theme: model
-        }, {
-            beforeClose: this.beforeModalClose
-        });
-    }
-
-    deactivate() {
-        this.isLeaving = true;
-        this.themeModal?.close();
-
-        this.isLeaving = false;
-        this.themeModal = null;
-    }
-
-    @action
-    beforeModalClose() {
-        if (this.themeModal && !this.isLeaving) {
-            this.router.transitionTo('settings.design.change-theme');
-        }
-    }
-}
diff --git a/ghost/admin/app/routes/settings/design/index.js b/ghost/admin/app/routes/settings/design/index.js
deleted file mode 100644
index f378f4f92fd..00000000000
--- a/ghost/admin/app/routes/settings/design/index.js
+++ /dev/null
@@ -1,68 +0,0 @@
-import AuthenticatedRoute from 'ghost-admin/routes/authenticated';
-import ConfirmUnsavedChangesModal from '../../../components/modals/confirm-unsaved-changes';
-import {action} from '@ember/object';
-import {inject as service} from '@ember/service';
-
-export default class SettingsDesignIndexRoute extends AuthenticatedRoute {
-    @service customThemeSettings;
-    @service modals;
-    @service settings;
-    @service store;
-
-    confirmModal = null;
-    hasConfirmed = false;
-    themes = this.store.peekAll('theme');
-
-    afterModel() {
-        super.afterModel(...arguments);
-        let activeTheme = this.themes.findBy('active', true);
-        if (typeof activeTheme === 'undefined') {
-            return this.transitionTo('settings.design.no-theme');
-        }
-    }
-
-    @action
-    willTransition(transition) {
-        if (this.hasConfirmed) {
-            return true;
-        }
-
-        // always abort when not confirmed because Ember's router doesn't automatically wait on promises
-        transition.abort();
-
-        this.confirmUnsavedChanges().then((shouldLeave) => {
-            if (shouldLeave === true) {
-                this.hasConfirmed = true;
-                return transition.retry();
-            }
-        });
-    }
-
-    deactivate() {
-        this.confirmModal = null;
-        this.hasConfirmed = false;
-
-        this.controllerFor('settings.design.index').reset();
-    }
-
-    confirmUnsavedChanges() {
-        if (!this.settings.hasDirtyAttributes && !this.customThemeSettings.isDirty) {
-            return Promise.resolve(true);
-        }
-
-        if (!this.confirmModal) {
-            this.confirmModal = this.modals.open(ConfirmUnsavedChangesModal)
-                .then((discardChanges) => {
-                    if (discardChanges === true) {
-                        this.settings.rollbackAttributes();
-                        this.customThemeSettings.rollback();
-                    }
-                    return discardChanges;
-                }).finally(() => {
-                    this.confirmModal = null;
-                });
-        }
-
-        return this.confirmModal;
-    }
-}
diff --git a/ghost/admin/app/routes/settings/design/no-theme.js b/ghost/admin/app/routes/settings/design/no-theme.js
deleted file mode 100644
index b0913630418..00000000000
--- a/ghost/admin/app/routes/settings/design/no-theme.js
+++ /dev/null
@@ -1,16 +0,0 @@
-import AuthenticatedRoute from 'ghost-admin/routes/authenticated';
-import {inject as service} from '@ember/service';
-
-export default class SettingsDesignNoThemeRoute extends AuthenticatedRoute {
-    @service store;
-
-    themes = this.store.peekAll('theme');
-
-    afterModel() {
-        super.afterModel(...arguments);
-        let activeTheme = this.themes.findBy('active', true);
-        if (typeof activeTheme !== 'undefined') {
-            return this.transitionTo('settings.design.index');
-        }
-    }
-}
diff --git a/ghost/admin/app/routes/settings/general.js b/ghost/admin/app/routes/settings/general.js
deleted file mode 100644
index f23da5cc6d5..00000000000
--- a/ghost/admin/app/routes/settings/general.js
+++ /dev/null
@@ -1,75 +0,0 @@
-import AdminRoute from 'ghost-admin/routes/admin';
-import ConfirmUnsavedChangesModal from '../../components/modals/confirm-unsaved-changes';
-import RSVP from 'rsvp';
-import {action} from '@ember/object';
-import {inject} from 'ghost-admin/decorators/inject';
-import {inject as service} from '@ember/service';
-
-export default class GeneralSettingsRoute extends AdminRoute {
-    @service modals;
-    @service settings;
-
-    @inject config;
-
-    model() {
-        return RSVP.hash({
-            settings: this.settings.reload()
-        });
-    }
-
-    deactivate() {
-        this.confirmModal = null;
-        this.hasConfirmed = false;
-    }
-
-    @action
-    async willTransition(transition) {
-        if (this.hasConfirmed) {
-            return true;
-        }
-
-        transition.abort();
-
-        // wait for any existing confirm modal to be closed before allowing transition
-        if (this.confirmModal) {
-            return;
-        }
-
-        if (this.controller.saveTask?.isRunning) {
-            await this.controller.saveTask.last;
-        }
-
-        const shouldLeave = await this.confirmUnsavedChanges();
-
-        if (shouldLeave) {
-            this.settings.rollbackAttributes();
-            this.hasConfirmed = true;
-            return transition.retry();
-        }
-    }
-
-    async confirmUnsavedChanges() {
-        if (this.settings.hasDirtyAttributes) {
-            this.confirmModal = this.modals
-                .open(ConfirmUnsavedChangesModal)
-                .finally(() => {
-                    this.confirmModal = null;
-                });
-
-            return this.confirmModal;
-        }
-
-        return true;
-    }
-
-    @action
-    reloadSettings() {
-        return this.settings.reload();
-    }
-
-    buildRouteInfoMetadata() {
-        return {
-            titleToken: 'Settings - General'
-        };
-    }
-}
diff --git a/ghost/admin/app/routes/settings/history.js b/ghost/admin/app/routes/settings/history.js
deleted file mode 100644
index dc363ad7b77..00000000000
--- a/ghost/admin/app/routes/settings/history.js
+++ /dev/null
@@ -1,9 +0,0 @@
-import AdminRoute from 'ghost-admin/routes/admin';
-
-export default class HistoryRoute extends AdminRoute {
-    buildRouteInfoMetadata() {
-        return {
-            titleToken: 'History log'
-        };
-    }
-}
diff --git a/ghost/admin/app/routes/settings/integration.js b/ghost/admin/app/routes/settings/integration.js
deleted file mode 100644
index 9223b720987..00000000000
--- a/ghost/admin/app/routes/settings/integration.js
+++ /dev/null
@@ -1,78 +0,0 @@
-import AdminRoute from 'ghost-admin/routes/admin';
-import ConfirmUnsavedChangesModal from '../../components/modals/confirm-unsaved-changes';
-import {action} from '@ember/object';
-import {inject as service} from '@ember/service';
-
-export default class IntegrationRoute extends AdminRoute {
-    @service modals;
-    @service router;
-
-    model(params, transition) {
-        // use the integrations controller to fetch all integrations and pick
-        // out the one we want. Allows navigation back to integrations screen
-        // without a loading state
-        return this
-            .controllerFor('settings.integrations')
-            .integrationModelHook('id', params.integration_id, this, transition);
-    }
-
-    resetController(controller) {
-        controller.regeneratedApiKey = null;
-    }
-
-    deactivate() {
-        this.confirmModal = null;
-        this.hasConfirmed = false;
-    }
-
-    @action
-    async willTransition(transition) {
-        if (this.hasConfirmed) {
-            return true;
-        }
-
-        transition.abort();
-
-        // wait for any existing confirm modal to be closed before allowing transition
-        if (this.confirmModal) {
-            return;
-        }
-
-        if (this.controller.saveTask?.isRunning) {
-            await this.controller.saveTask.last;
-        }
-
-        const shouldLeave = await this.confirmUnsavedChanges();
-
-        if (shouldLeave) {
-            this.controller.model.rollbackAttributes();
-            this.hasConfirmed = true;
-            return transition.retry();
-        }
-    }
-
-    async confirmUnsavedChanges() {
-        if (this.controller.model?.hasDirtyAttributes) {
-            this.confirmModal = this.modals
-                .open(ConfirmUnsavedChangesModal)
-                .finally(() => {
-                    this.confirmModal = null;
-                });
-
-            return this.confirmModal;
-        }
-
-        return true;
-    }
-
-    @action
-    save() {
-        this.controller.send('save');
-    }
-
-    buildRouteInfoMetadata() {
-        return {
-            titleToken: 'Settings - Integrations'
-        };
-    }
-}
diff --git a/ghost/admin/app/routes/settings/integration/webhooks/edit.js b/ghost/admin/app/routes/settings/integration/webhooks/edit.js
deleted file mode 100644
index 4d6e9cd48b1..00000000000
--- a/ghost/admin/app/routes/settings/integration/webhooks/edit.js
+++ /dev/null
@@ -1,49 +0,0 @@
-import AdminRoute from 'ghost-admin/routes/admin';
-import WebhookFormModal from '../../../../components/settings/integrations/webhook-form-modal';
-import {action} from '@ember/object';
-import {inject as service} from '@ember/service';
-
-export default class EditWebhookRoute extends AdminRoute {
-    @service modals;
-    @service router;
-
-    webhook = null;
-    modal = null;
-
-    get integration() {
-        return this.modelFor('settings.integration');
-    }
-
-    model(params) {
-        return this.integration.webhooks.findBy('id', params.webhook_id);
-    }
-
-    setupController(controller, model) {
-        this.webhook = model;
-
-        this.modal = this.modals.open(WebhookFormModal, {
-            webhook: this.webhook
-        }, {
-            beforeClose: this.beforeModalClose
-        });
-    }
-
-    deactivate() {
-        this.webhook?.errors.clear();
-        this.webhook?.rollbackAttributes();
-
-        // ensure we don't try to redirect on modal close if we're already transitioning away
-        this.isLeaving = true;
-        this.modal?.close();
-
-        this.modal = null;
-        this.isLeaving = false;
-    }
-
-    @action
-    beforeModalClose() {
-        if (this.modal && !this.isLeaving) {
-            this.router.transitionTo('settings.integration', this.integration);
-        }
-    }
-}
diff --git a/ghost/admin/app/routes/settings/integration/webhooks/new.js b/ghost/admin/app/routes/settings/integration/webhooks/new.js
deleted file mode 100644
index f972b4f1d44..00000000000
--- a/ghost/admin/app/routes/settings/integration/webhooks/new.js
+++ /dev/null
@@ -1,45 +0,0 @@
-import AdminRoute from 'ghost-admin/routes/admin';
-import WebhookFormModal from '../../../../components/settings/integrations/webhook-form-modal';
-import {action} from '@ember/object';
-import {inject as service} from '@ember/service';
-
-export default class NewWebhookRoute extends AdminRoute {
-    @service modals;
-    @service router;
-
-    webhook = null;
-    modal = null;
-
-    get integration() {
-        return this.modelFor('settings.integration');
-    }
-
-    model() {
-        this.webhook = this.store.createRecord('webhook', {integration: this.integration});
-
-        this.modal = this.modals.open(WebhookFormModal, {
-            webhook: this.webhook
-        }, {
-            beforeClose: this.beforeModalClose
-        });
-    }
-
-    deactivate() {
-        this.webhook?.errors.clear();
-        this.webhook?.rollbackAttributes();
-
-        // ensure we don't try to redirect on modal close if we're already transitioning away
-        this.isLeaving = true;
-        this.modal?.close();
-
-        this.modal = null;
-        this.isLeaving = false;
-    }
-
-    @action
-    beforeModalClose() {
-        if (this.modal && !this.isLeaving) {
-            this.router.transitionTo('settings.integration', this.integration);
-        }
-    }
-}
diff --git a/ghost/admin/app/routes/settings/integrations.js b/ghost/admin/app/routes/settings/integrations.js
deleted file mode 100644
index 68ba78187c6..00000000000
--- a/ghost/admin/app/routes/settings/integrations.js
+++ /dev/null
@@ -1,18 +0,0 @@
-import AdminRoute from 'ghost-admin/routes/admin';
-import {inject as service} from '@ember/service';
-
-export default class IntegrationsRoute extends AdminRoute {
-    @service settings;
-
-    setupController(controller) {
-        // kick off the background fetch of integrations so that we can
-        // show the screen immediately
-        controller.fetchIntegrations.perform();
-    }
-
-    buildRouteInfoMetadata() {
-        return {
-            titleToken: 'Settings - Integrations'
-        };
-    }
-}
diff --git a/ghost/admin/app/routes/settings/integrations/amp.js b/ghost/admin/app/routes/settings/integrations/amp.js
deleted file mode 100644
index 7d17e828714..00000000000
--- a/ghost/admin/app/routes/settings/integrations/amp.js
+++ /dev/null
@@ -1,69 +0,0 @@
-import AdminRoute from 'ghost-admin/routes/admin';
-import ConfirmUnsavedChangesModal from '../../../components/modals/confirm-unsaved-changes';
-import {action} from '@ember/object';
-import {inject as service} from '@ember/service';
-
-export default class AMPRoute extends AdminRoute {
-    @service modals;
-    @service settings;
-
-    model() {
-        this.settings.reload();
-    }
-
-    deactivate() {
-        this.confirmModal = null;
-        this.hasConfirmed = false;
-    }
-
-    @action
-    async willTransition(transition) {
-        if (this.hasConfirmed) {
-            return true;
-        }
-
-        transition.abort();
-
-        // wait for any existing confirm modal to be closed before allowing transition
-        if (this.confirmModal) {
-            return;
-        }
-
-        if (this.controller.saveTask?.isRunning) {
-            await this.controller.saveTask.last;
-        }
-
-        const shouldLeave = await this.confirmUnsavedChanges();
-
-        if (shouldLeave) {
-            this.settings.rollbackAttributes();
-            this.hasConfirmed = true;
-            return transition.retry();
-        }
-    }
-
-    async confirmUnsavedChanges() {
-        if (this.settings.hasDirtyAttributes) {
-            this.confirmModal = this.modals
-                .open(ConfirmUnsavedChangesModal)
-                .finally(() => {
-                    this.confirmModal = null;
-                });
-
-            return this.confirmModal;
-        }
-
-        return true;
-    }
-
-    @action
-    save() {
-        this.controller.send('save');
-    }
-
-    buildRouteInfoMetadata() {
-        return {
-            titleToken: 'AMP'
-        };
-    }
-}
diff --git a/ghost/admin/app/routes/settings/integrations/firstpromoter.js b/ghost/admin/app/routes/settings/integrations/firstpromoter.js
deleted file mode 100644
index 573c0fb7683..00000000000
--- a/ghost/admin/app/routes/settings/integrations/firstpromoter.js
+++ /dev/null
@@ -1,69 +0,0 @@
-import AdminRoute from 'ghost-admin/routes/admin';
-import ConfirmUnsavedChangesModal from '../../../components/modals/confirm-unsaved-changes';
-import {action} from '@ember/object';
-import {inject as service} from '@ember/service';
-
-export default class FirstPromotionIntegrationRoute extends AdminRoute {
-    @service modals;
-    @service settings;
-
-    model() {
-        return this.settings.reload();
-    }
-
-    deactivate() {
-        this.confirmModal = null;
-        this.hasConfirmed = false;
-    }
-
-    @action
-    async willTransition(transition) {
-        if (this.hasConfirmed) {
-            return true;
-        }
-
-        transition.abort();
-
-        // wait for any existing confirm modal to be closed before allowing transition
-        if (this.confirmModal) {
-            return;
-        }
-
-        if (this.controller.saveTask?.isRunning) {
-            await this.controller.saveTask.last;
-        }
-
-        const shouldLeave = await this.confirmUnsavedChanges();
-
-        if (shouldLeave) {
-            this.settings.rollbackAttributes();
-            this.hasConfirmed = true;
-            return transition.retry();
-        }
-    }
-
-    async confirmUnsavedChanges() {
-        if (this.settings.hasDirtyAttributes) {
-            this.confirmModal = this.modals
-                .open(ConfirmUnsavedChangesModal)
-                .finally(() => {
-                    this.confirmModal = null;
-                });
-
-            return this.confirmModal;
-        }
-
-        return true;
-    }
-
-    @action
-    save() {
-        this.controller.send('save');
-    }
-
-    buildRouteInfoMetadata() {
-        return {
-            titleToken: 'FirstPromoter'
-        };
-    }
-}
diff --git a/ghost/admin/app/routes/settings/integrations/new.js b/ghost/admin/app/routes/settings/integrations/new.js
deleted file mode 100644
index d6d65bf49fb..00000000000
--- a/ghost/admin/app/routes/settings/integrations/new.js
+++ /dev/null
@@ -1,48 +0,0 @@
-import AdminRoute from 'ghost-admin/routes/admin';
-import CustomIntegrationLimitsModal from '../../../components/modals/limits/custom-integration';
-import NewCustomIntegrationModal from '../../../components/modals/new-custom-integration';
-import {action} from '@ember/object';
-import {inject as service} from '@ember/service';
-
-export default class NewIntegrationRoute extends AdminRoute {
-    @service limit;
-    @service modals;
-    @service router;
-
-    modal = null;
-
-    async model() {
-        if (this.limit.limiter?.isLimited('customIntegrations')) {
-            try {
-                await this.limit.limiter.errorIfWouldGoOverLimit('customIntegrations');
-            } catch (error) {
-                this.modal = this.modals.open(CustomIntegrationLimitsModal, {
-                    message: error.message
-                }, {
-                    beforeClose: this.beforeModalClose
-                });
-                return;
-            }
-        }
-
-        this.modal = this.modals.open(NewCustomIntegrationModal, {}, {
-            beforeClose: this.beforeModalClose
-        });
-    }
-
-    deactivate() {
-        // ensure we don't try to redirect on modal close if we're already transitioning away
-        this.isLeaving = true;
-        this.modal?.close();
-
-        this.modal = null;
-        this.isLeaving = false;
-    }
-
-    @action
-    beforeModalClose() {
-        if (this.modal && !this.isLeaving) {
-            this.router.transitionTo('settings.integrations');
-        }
-    }
-}
diff --git a/ghost/admin/app/routes/settings/integrations/pintura.js b/ghost/admin/app/routes/settings/integrations/pintura.js
deleted file mode 100644
index a00242dfaca..00000000000
--- a/ghost/admin/app/routes/settings/integrations/pintura.js
+++ /dev/null
@@ -1,69 +0,0 @@
-import AdminRoute from 'ghost-admin/routes/admin';
-import ConfirmUnsavedChangesModal from '../../../components/modals/confirm-unsaved-changes';
-import {action} from '@ember/object';
-import {inject as service} from '@ember/service';
-
-export default class PinturaIntegrationRoute extends AdminRoute {
-    @service modals;
-    @service settings;
-
-    model() {
-        return this.settings.reload();
-    }
-
-    deactivate() {
-        this.confirmModal = null;
-        this.hasConfirmed = false;
-    }
-
-    @action
-    async willTransition(transition) {
-        if (this.hasConfirmed) {
-            return true;
-        }
-
-        transition.abort();
-
-        // wait for any existing confirm modal to be closed before allowing transition
-        if (this.confirmModal) {
-            return;
-        }
-
-        if (this.controller.saveTask?.isRunning) {
-            await this.controller.saveTask.last;
-        }
-
-        const shouldLeave = await this.confirmUnsavedChanges();
-
-        if (shouldLeave) {
-            this.settings.rollbackAttributes();
-            this.hasConfirmed = true;
-            return transition.retry();
-        }
-    }
-
-    async confirmUnsavedChanges() {
-        if (this.settings.hasDirtyAttributes) {
-            this.confirmModal = this.modals
-                .open(ConfirmUnsavedChangesModal)
-                .finally(() => {
-                    this.confirmModal = null;
-                });
-
-            return this.confirmModal;
-        }
-
-        return true;
-    }
-
-    @action
-    save() {
-        this.controller.send('save');
-    }
-
-    buildRouteInfoMetadata() {
-        return {
-            titleToken: 'Pintura'
-        };
-    }
-}
diff --git a/ghost/admin/app/routes/settings/integrations/slack.js b/ghost/admin/app/routes/settings/integrations/slack.js
deleted file mode 100644
index 22424c01bb3..00000000000
--- a/ghost/admin/app/routes/settings/integrations/slack.js
+++ /dev/null
@@ -1,69 +0,0 @@
-import AdminRoute from 'ghost-admin/routes/admin';
-import ConfirmUnsavedChangesModal from '../../../components/modals/confirm-unsaved-changes';
-import {action} from '@ember/object';
-import {inject as service} from '@ember/service';
-
-export default class SlackIntegrationRoute extends AdminRoute {
-    @service modals;
-    @service settings;
-
-    model() {
-        this.settings.reload();
-    }
-
-    deactivate() {
-        this.confirmModal = null;
-        this.hasConfirmed = false;
-    }
-
-    @action
-    async willTransition(transition) {
-        if (this.hasConfirmed) {
-            return true;
-        }
-
-        transition.abort();
-
-        // wait for any existing confirm modal to be closed before allowing transition
-        if (this.confirmModal) {
-            return;
-        }
-
-        if (this.controller.saveTask?.isRunning) {
-            await this.controller.saveTask.last;
-        }
-
-        const shouldLeave = await this.confirmUnsavedChanges();
-
-        if (shouldLeave) {
-            this.settings.rollbackAttributes();
-            this.hasConfirmed = true;
-            return transition.retry();
-        }
-    }
-
-    async confirmUnsavedChanges() {
-        if (this.settings.hasDirtyAttributes) {
-            this.confirmModal = this.modals
-                .open(ConfirmUnsavedChangesModal)
-                .finally(() => {
-                    this.confirmModal = null;
-                });
-
-            return this.confirmModal;
-        }
-
-        return true;
-    }
-
-    @action
-    save() {
-        this.controller.send('save');
-    }
-
-    buildRouteInfoMetadata() {
-        return {
-            titleToken: 'Slack'
-        };
-    }
-}
diff --git a/ghost/admin/app/routes/settings/integrations/unsplash.js b/ghost/admin/app/routes/settings/integrations/unsplash.js
deleted file mode 100644
index 96bba29ff09..00000000000
--- a/ghost/admin/app/routes/settings/integrations/unsplash.js
+++ /dev/null
@@ -1,69 +0,0 @@
-import AdminRoute from 'ghost-admin/routes/admin';
-import ConfirmUnsavedChangesModal from '../../../components/modals/confirm-unsaved-changes';
-import {action} from '@ember/object';
-import {inject as service} from '@ember/service';
-
-export default class UnsplashIntegrationRoute extends AdminRoute {
-    @service modals;
-    @service settings;
-
-    model() {
-        this.settings.reload();
-    }
-
-    deactivate() {
-        this.confirmModal = null;
-        this.hasConfirmed = false;
-    }
-
-    @action
-    async willTransition(transition) {
-        if (this.hasConfirmed) {
-            return true;
-        }
-
-        transition.abort();
-
-        // wait for any existing confirm modal to be closed before allowing transition
-        if (this.confirmModal) {
-            return;
-        }
-
-        if (this.controller.saveTask?.isRunning) {
-            await this.controller.saveTask.last;
-        }
-
-        const shouldLeave = await this.confirmUnsavedChanges();
-
-        if (shouldLeave) {
-            this.settings.rollbackAttributes();
-            this.hasConfirmed = true;
-            return transition.retry();
-        }
-    }
-
-    async confirmUnsavedChanges() {
-        if (this.settings.hasDirtyAttributes) {
-            this.confirmModal = this.modals
-                .open(ConfirmUnsavedChangesModal)
-                .finally(() => {
-                    this.confirmModal = null;
-                });
-
-            return this.confirmModal;
-        }
-
-        return true;
-    }
-
-    @action
-    save() {
-        this.controller.send('save');
-    }
-
-    buildRouteInfoMetadata() {
-        return {
-            titleToken: 'Unsplash'
-        };
-    }
-}
diff --git a/ghost/admin/app/routes/settings/integrations/zapier.js b/ghost/admin/app/routes/settings/integrations/zapier.js
deleted file mode 100644
index f8311f506d9..00000000000
--- a/ghost/admin/app/routes/settings/integrations/zapier.js
+++ /dev/null
@@ -1,36 +0,0 @@
-import AdminRoute from 'ghost-admin/routes/admin';
-import {inject} from 'ghost-admin/decorators/inject';
-import {inject as service} from '@ember/service';
-
-export default class ZapierRoute extends AdminRoute {
-    @service router;
-
-    @inject config;
-
-    beforeModel() {
-        super.beforeModel(...arguments);
-
-        if (this.config.hostSettings?.limits?.customIntegrations?.disabled) {
-            return this.transitionTo('settings.integrations');
-        }
-    }
-
-    model(params, transition) {
-        // use the integrations controller to fetch all integrations and pick
-        // out the one we want. Allows navigation back to integrations screen
-        // without a loading state
-        return this
-            .controllerFor('settings.integrations')
-            .integrationModelHook('slug', 'zapier', this, transition);
-    }
-
-    resetController(controller) {
-        controller.regeneratedApiKey = null;
-    }
-
-    buildRouteInfoMetadata() {
-        return {
-            titleToken: 'Zapier'
-        };
-    }
-}
diff --git a/ghost/admin/app/routes/settings/labs.js b/ghost/admin/app/routes/settings/labs.js
deleted file mode 100644
index febc7234af1..00000000000
--- a/ghost/admin/app/routes/settings/labs.js
+++ /dev/null
@@ -1,23 +0,0 @@
-import AdminRoute from 'ghost-admin/routes/admin';
-import {inject as service} from '@ember/service';
-
-export default class LabsRoute extends AdminRoute {
-    @service settings;
-    @service notifications;
-
-    model() {
-        return this.settings.reload();
-    }
-
-    resetController(controller, isExiting) {
-        if (isExiting) {
-            controller.reset();
-        }
-    }
-
-    buildRouteInfoMetadata() {
-        return {
-            titleToken: 'Settings - Labs'
-        };
-    }
-}
diff --git a/ghost/admin/app/routes/settings/labs/import.js b/ghost/admin/app/routes/settings/labs/import.js
deleted file mode 100644
index f33f63d0c99..00000000000
--- a/ghost/admin/app/routes/settings/labs/import.js
+++ /dev/null
@@ -1,25 +0,0 @@
-import AdminRoute from 'ghost-admin/routes/admin';
-import ImportContentModal from '../../../components/modal-import-content';
-import {action} from '@ember/object';
-import {inject as service} from '@ember/service';
-
-export default class LabsImportRoute extends AdminRoute {
-    @service modals;
-
-    importModal = null;
-
-    setupController() {
-        this.importModal?.close();
-
-        this.importModal = this.modals.open(ImportContentModal, {}, {
-            className: 'fullscreen-modal fullscreen-modal-action fullscreen-modal-import-content',
-            beforeClose: this.beforeModalClose
-        });
-    }
-
-    @action
-    async beforeModalClose() {
-        this.router.transitionTo('settings.labs');
-        return true;
-    }
-}
diff --git a/ghost/admin/app/routes/settings/members-email.js b/ghost/admin/app/routes/settings/members-email.js
deleted file mode 100644
index 26d0ef64cb6..00000000000
--- a/ghost/admin/app/routes/settings/members-email.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import AdminRoute from 'ghost-admin/routes/admin';
-
-export default class MembersEmailRoute extends AdminRoute {
-    beforeModel() {
-        // Moved to newsletters
-        return this.replaceWith('settings.newsletters');
-    }
-}
diff --git a/ghost/admin/app/routes/settings/membership.js b/ghost/admin/app/routes/settings/membership.js
deleted file mode 100644
index 42c6d57a633..00000000000
--- a/ghost/admin/app/routes/settings/membership.js
+++ /dev/null
@@ -1,98 +0,0 @@
-import AdminRoute from 'ghost-admin/routes/admin';
-import ConfirmUnsavedChangesModal from '../../components/modals/confirm-unsaved-changes';
-import VerifyEmail from '../../components/modals/settings/verify-email';
-import {action} from '@ember/object';
-import {inject as service} from '@ember/service';
-
-export default class MembershipSettingsRoute extends AdminRoute {
-    @service notifications;
-    @service settings;
-    @service modals;
-
-    queryParams = {
-        verifyEmail: {
-            replace: true
-        }
-    };
-
-    beforeModel(transition) {
-        super.beforeModel(...arguments);
-
-        // @todo: remove in the future, but keep it for now because we might still have some old verification urls in emails
-        if (transition.to.queryParams?.supportAddressUpdate === 'success') {
-            this.notifications.showAlert(
-                `Support email address has been updated`,
-                {type: 'success', key: 'members.settings.support-address.updated'}
-            );
-        }
-    }
-
-    model() {
-        this.settings.reload();
-    }
-
-    afterModel(model, transition) {
-        if (transition.to.queryParams.verifyEmail) {
-            this.modals.open(VerifyEmail, {
-                token: transition.to.queryParams.verifyEmail
-            });
-
-            // clear query param so it doesn't linger and cause problems re-entering route
-            transition.abort();
-            return this.transitionTo('settings.membership', {queryParams: {verifyEmail: null}});
-        }
-    }
-
-    @action
-    async willTransition(transition) {
-        if (this.hasConfirmed) {
-            return true;
-        }
-
-        transition.abort();
-
-        // wait for any existing confirm modal to be closed before allowing transition
-        if (this.confirmModal) {
-            return;
-        }
-
-        if (this.controller.saveTask?.isRunning) {
-            await this.controller.saveTask.last;
-        }
-
-        const shouldLeave = await this.confirmUnsavedChanges();
-
-        if (shouldLeave) {
-            this.controller.reset();
-
-            this.hasConfirmed = true;
-            return transition.retry();
-        }
-    }
-
-    async confirmUnsavedChanges() {
-        if (this.controller.isDirty) {
-            this.confirmModal = this.modals
-                .open(ConfirmUnsavedChangesModal)
-                .finally(() => {
-                    this.confirmModal = null;
-                });
-
-            return this.confirmModal;
-        }
-
-        return true;
-    }
-
-    buildRouteInfoMetadata() {
-        return {
-            titleToken: 'Settings - Membership'
-        };
-    }
-
-    resetController(controller, isExiting) {
-        if (isExiting) {
-            controller.reset();
-        }
-    }
-}
diff --git a/ghost/admin/app/routes/settings/navigation.js b/ghost/admin/app/routes/settings/navigation.js
deleted file mode 100644
index 44d28ab2332..00000000000
--- a/ghost/admin/app/routes/settings/navigation.js
+++ /dev/null
@@ -1,74 +0,0 @@
-import AdminRoute from 'ghost-admin/routes/admin';
-import ConfirmUnsavedChangesModal from '../../components/modals/confirm-unsaved-changes';
-import {action} from '@ember/object';
-import {inject as service} from '@ember/service';
-
-export default class NavigationRoute extends AdminRoute {
-    @service modals;
-    @service settings;
-
-    model() {
-        this.settings.reload();
-    }
-
-    setupController() {
-        this.controller.reset();
-    }
-
-    deactivate() {
-        this.confirmModal = null;
-        this.hasConfirmed = false;
-        this.controller.reset();
-    }
-
-    @action
-    async willTransition(transition) {
-        if (this.hasConfirmed) {
-            return true;
-        }
-
-        transition.abort();
-
-        // wait for any existing confirm modal to be closed before allowing transition
-        if (this.confirmModal) {
-            return;
-        }
-
-        if (this.controller.saveTask?.isRunning) {
-            await this.controller.saveTask.last;
-        }
-
-        const shouldLeave = await this.confirmUnsavedChanges();
-
-        if (shouldLeave) {
-            this.settings.rollbackAttributes();
-            this.hasConfirmed = true;
-            return transition.retry();
-        }
-    }
-
-    async confirmUnsavedChanges() {
-        if (this.controller.dirtyAttributes) {
-            this.confirmModal = this.modals
-                .open(ConfirmUnsavedChangesModal)
-                .finally(() => {
-                    this.confirmModal = null;
-                });
-
-            return this.confirmModal;
-        }
-
-        return true;
-    }
-
-    @action
-    save() {
-        this.controller.send('save');
-    }
-
-    buildRouteInfoMetadata() {
-        return {
-            titleToken: 'Settings - Navigation'
-        };
-    }
-}
diff --git a/ghost/admin/app/routes/settings/newsletters.js b/ghost/admin/app/routes/settings/newsletters.js
deleted file mode 100644
index 2c014101815..00000000000
--- a/ghost/admin/app/routes/settings/newsletters.js
+++ /dev/null
@@ -1,85 +0,0 @@
-import AdminRoute from 'ghost-admin/routes/admin';
-import ConfirmUnsavedChangesModal from '../../components/modals/confirm-unsaved-changes';
-import VerifyNewsletterEmail from '../../components/modals/newsletters/verify-newsletter-email';
-import {action} from '@ember/object';
-import {inject as service} from '@ember/service';
-
-export default class MembersEmailLabsRoute extends AdminRoute {
-    @service feature;
-    @service modals;
-    @service notifications;
-    @service settings;
-
-    queryParams = {
-        verifyEmail: {
-            replace: true
-        }
-    };
-
-    confirmModal = null;
-    hasConfirmed = false;
-
-    model() {
-        return this.settings.reload();
-    }
-
-    afterModel(model, transition) {
-        if (transition.to.queryParams.verifyEmail) {
-            this.modals.open(VerifyNewsletterEmail, {
-                token: transition.to.queryParams.verifyEmail
-            });
-
-            // clear query param so it doesn't linger and cause problems re-entering route
-            transition.abort();
-            return this.transitionTo('settings.newsletters', {queryParams: {verifyEmail: null}});
-        }
-    }
-
-    @action
-    willTransition(transition) {
-        if (this.hasConfirmed) {
-            return true;
-        }
-
-        // always abort when not confirmed because Ember's router doesn't automatically wait on promises
-        transition.abort();
-
-        this.confirmUnsavedChanges().then((shouldLeave) => {
-            if (shouldLeave) {
-                this.hasConfirmed = true;
-                return transition.retry();
-            }
-        });
-    }
-
-    deactivate() {
-        this.confirmModal = null;
-        this.hasConfirmed = false;
-    }
-
-    confirmUnsavedChanges() {
-        if (!this.settings.hasDirtyAttributes) {
-            return Promise.resolve(true);
-        }
-
-        if (!this.confirmModal) {
-            this.confirmModal = this.modals.open(ConfirmUnsavedChangesModal)
-                .then((discardChanges) => {
-                    if (discardChanges === true) {
-                        this.settings.rollbackAttributes();
-                    }
-                    return discardChanges;
-                }).finally(() => {
-                    this.confirmModal = null;
-                });
-        }
-
-        return this.confirmModal;
-    }
-
-    buildRouteInfoMetadata() {
-        return {
-            titleToken: 'Settings - Email newsletter'
-        };
-    }
-}
diff --git a/ghost/admin/app/routes/settings/newsletters/edit-newsletter.js b/ghost/admin/app/routes/settings/newsletters/edit-newsletter.js
deleted file mode 100644
index 0d936613154..00000000000
--- a/ghost/admin/app/routes/settings/newsletters/edit-newsletter.js
+++ /dev/null
@@ -1,97 +0,0 @@
-import AdminRoute from 'ghost-admin/routes/admin';
-import ConfirmUnsavedChangesModal from '../../../components/modals/confirm-unsaved-changes';
-import EditNewsletterModal from '../../../components/modals/newsletters/edit';
-import {action} from '@ember/object';
-import {inject as service} from '@ember/service';
-
-export default class EditNewsletterRoute extends AdminRoute {
-    @service modals;
-    @service router;
-    @service store;
-
-    newsletterModal = null;
-
-    model(params) {
-        return this.store.find('newsletter', params.newsletter_id);
-    }
-
-    setupController(controller, model) {
-        this.newsletterModal?.close();
-
-        this.newsletterModal = this.modals.open(EditNewsletterModal, {
-            newsletter: model,
-            afterSave: this.afterSave
-        }, {
-            beforeClose: this.beforeModalClose
-        });
-    }
-
-    @action
-    afterSave() {
-        this.router.transitionTo('settings.newsletters');
-    }
-
-    deactivate() {
-        this.isLeaving = true;
-        this.newsletterModal?.close();
-
-        this.isLeaving = false;
-        this.newsletterModal = null;
-
-        this.confirmModal = null;
-        this.hasConfirmed = false;
-    }
-
-    @action
-    async willTransition(transition) {
-        if (this.hasConfirmed) {
-            return true;
-        }
-
-        transition.abort();
-
-        // wait for any existing confirm modal to be closed before allowing transition
-        if (this.confirmModal) {
-            return;
-        }
-
-        const shouldLeave = await this.confirmUnsavedChanges();
-
-        if (shouldLeave) {
-            this.hasConfirmed = true;
-            return transition.retry();
-        }
-    }
-
-    async confirmUnsavedChanges() {
-        const newsletter = this.newsletterModal?._data.newsletter;
-
-        if (newsletter?.hasDirtyAttributes) {
-            this.confirmModal = this.modals.open(ConfirmUnsavedChangesModal)
-                .then((discardChanges) => {
-                    if (discardChanges === true) {
-                        newsletter.rollbackAttributes();
-                    }
-                    return discardChanges;
-                }).finally(() => {
-                    this.confirmModal = null;
-                });
-
-            return this.confirmModal;
-        }
-
-        return true;
-    }
-
-    @action
-    async beforeModalClose() {
-        const shouldLeave = await this.confirmUnsavedChanges();
-
-        if (shouldLeave && !this.isLeaving) {
-            this.router.transitionTo('settings.newsletters');
-            return true;
-        }
-
-        return false;
-    }
-}
diff --git a/ghost/admin/app/routes/settings/newsletters/new-newsletter.js b/ghost/admin/app/routes/settings/newsletters/new-newsletter.js
deleted file mode 100644
index c7e72e402be..00000000000
--- a/ghost/admin/app/routes/settings/newsletters/new-newsletter.js
+++ /dev/null
@@ -1,67 +0,0 @@
-import AdminRoute from 'ghost-admin/routes/admin';
-import MultipleNewslettersLimitModal from '../../../components/modals/limits/multiple-newsletters';
-import NewNewsletterModal from '../../../components/modals/newsletters/new';
-import {action} from '@ember/object';
-import {inject as service} from '@ember/service';
-
-export default class NewNewsletterRoute extends AdminRoute {
-    @service modals;
-    @service router;
-    @service settings;
-    @service store;
-    @service limit;
-
-    newsletterModal = null;
-
-    /**
-     * Before we allow the creation of a new newsletter, we should check the limits and return to the newsletters page if required.
-     */
-    async beforeModel() {
-        try {
-            await this.limit.limiter.errorIfWouldGoOverLimit('newsletters');
-        } catch (error) {
-            if (error.errorType === 'HostLimitError') {
-                // Not allowed: we reached the limit here
-                this.modals.open(MultipleNewslettersLimitModal, {
-                    message: error.message
-                });
-                return this.replaceWith('settings.newsletters');
-            }
-
-            throw error;
-        }
-    }
-
-    model() {
-        return this.store.createRecord('newsletter');
-    }
-
-    setupController(controller, model) {
-        this.newsletterModal?.close();
-
-        this.newsletterModal = this.modals.open(NewNewsletterModal, {
-            newsletter: model,
-            afterSave: this.afterSave
-        }, {
-            beforeClose: this.beforeModalClose
-        });
-    }
-
-    @action
-    afterSave() {
-        this.router.transitionTo('settings.newsletters');
-    }
-
-    deactivate() {
-        this.isLeaving = true;
-        this.newsletterModal?.close();
-        this.isLeaving = false;
-    }
-
-    @action
-    async beforeModalClose() {
-        if (!this.isLeaving) {
-            this.router.transitionTo('settings.newsletters');
-        }
-    }
-}
diff --git a/ghost/admin/app/routes/settings/staff/index.js b/ghost/admin/app/routes/settings/staff/index.js
deleted file mode 100644
index 03445cdd8dc..00000000000
--- a/ghost/admin/app/routes/settings/staff/index.js
+++ /dev/null
@@ -1,32 +0,0 @@
-import AuthenticatedRoute from 'ghost-admin/routes/authenticated';
-import {inject as service} from '@ember/service';
-
-export default class IndexRoute extends AuthenticatedRoute {
-    @service infinity;
-    @service session;
-
-    beforeModel() {
-        super.beforeModel(...arguments);
-
-        const user = this.session.user;
-
-        if (user.isAuthorOrContributor) {
-            return this.transitionTo('settings.staff.user', user);
-        }
-    }
-
-    model() {
-        return this.session.user;
-    }
-
-    setupController(controller) {
-        super.setupController(...arguments);
-        controller.backgroundUpdateTask.perform();
-    }
-
-    buildRouteInfoMetadata() {
-        return {
-            titleToken: 'Staff'
-        };
-    }
-}
diff --git a/ghost/admin/app/routes/settings/staff/user.js b/ghost/admin/app/routes/settings/staff/user.js
deleted file mode 100644
index 3f2a0ff6e9a..00000000000
--- a/ghost/admin/app/routes/settings/staff/user.js
+++ /dev/null
@@ -1,101 +0,0 @@
-import AuthenticatedRoute from 'ghost-admin/routes/authenticated';
-import ConfirmUnsavedChangesModal from '../../../components/modals/confirm-unsaved-changes';
-import {action} from '@ember/object';
-import {inject as service} from '@ember/service';
-
-export default class UserRoute extends AuthenticatedRoute {
-    @service modals;
-
-    model(params) {
-        return this.store.queryRecord('user', {slug: params.user_slug, include: 'count.posts'});
-    }
-
-    afterModel(user) {
-        super.afterModel(...arguments);
-
-        const currentUser = this.session.user;
-
-        let isOwnProfile = user.id === currentUser.id;
-        let isAuthorOrContributor = currentUser.isAuthorOrContributor;
-        let isEditor = currentUser.isEditor;
-
-        if (isAuthorOrContributor && !isOwnProfile) {
-            this.transitionTo('settings.staff.user', currentUser);
-        } else if (isEditor && !isOwnProfile && !user.isAuthorOrContributor) {
-            this.transitionTo('settings.staff');
-        }
-
-        if (isOwnProfile) {
-            this.store.queryRecord('api-key', {id: 'me'}).then((apiKey) => {
-                this.controller.personalToken = apiKey.id + ':' + apiKey.secret;
-                this.controller.personalTokenRegenerated = false;
-            });
-        }
-    }
-
-    serialize(model) {
-        return {user_slug: model.get('slug')};
-    }
-
-    setupController(controller, model) {
-        controller.model = model;
-        controller.reset();
-    }
-
-    @action
-    async willTransition(transition) {
-        if (this.hasConfirmed) {
-            return true;
-        }
-
-        transition.abort();
-
-        // wait for any existing confirm modal to be closed before allowing transition
-        if (this.confirmModal) {
-            return;
-        }
-
-        if (this.controller.saveTask?.isRunning) {
-            await this.controller.saveTask.last;
-        }
-
-        const shouldLeave = await this.confirmUnsavedChanges();
-
-        if (shouldLeave) {
-            this.controller.reset();
-            this.hasConfirmed = true;
-            return transition.retry();
-        }
-    }
-
-    async confirmUnsavedChanges() {
-        if (this.controller.model.hasDirtyAttributes || this.controller.dirtyAttributes) {
-            this.confirmModal = this.modals
-                .open(ConfirmUnsavedChangesModal)
-                .finally(() => {
-                    this.confirmModal = null;
-                });
-
-            return this.confirmModal;
-        }
-
-        return true;
-    }
-
-    deactivate() {
-        this.confirmModal = null;
-        this.hasConfirmed = false;
-        this.controller.reset();
-    }
-
-    @action
-    didTransition() {
-        this.modelFor('settings.staff.user').get('errors').clear();
-    }
-
-    buildRouteInfoMetadata() {
-        return {
-            titleToken: 'Staff - User'
-        };
-    }
-}
diff --git a/ghost/admin/app/routes/settings/theme-install.js b/ghost/admin/app/routes/settings/theme-install.js
deleted file mode 100644
index ad53daa2eb1..00000000000
--- a/ghost/admin/app/routes/settings/theme-install.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import Route from '@ember/routing/route';
-
-export default class InstallThemeRoute extends Route {
-    redirect(model, transition) {
-        this.transitionTo('settings.design.change-theme.install', {queryParams: transition.to.queryParams});
-    }
-}
diff --git a/ghost/admin/app/services/ajax.js b/ghost/admin/app/services/ajax.js
index aec7a81c48d..402fe1f7970 100644
--- a/ghost/admin/app/services/ajax.js
+++ b/ghost/admin/app/services/ajax.js
@@ -1,3 +1,4 @@
+import * as Sentry from '@sentry/ember';
 import AjaxService from 'ember-ajax/services/ajax';
 import classic from 'ember-classic-decorator';
 import config from 'ghost-admin/config/environment';
@@ -5,7 +6,6 @@ import moment from 'moment-timezone';
 import semverCoerce from 'semver/functions/coerce';
 import semverLt from 'semver/functions/lt';
 import {AjaxError, isAjaxError, isForbiddenError} from 'ember-ajax/errors';
-import {captureMessage} from '@sentry/ember';
 import {get} from '@ember/object';
 import {inject} from 'ghost-admin/decorators/inject';
 import {isArray as isEmberArray} from '@ember/array';
@@ -43,7 +43,7 @@ export function isVersionMismatchError(errorOrStatus, payload) {
 
 export class DataImportError extends AjaxError {
     constructor(payload) {
-        super(payload, 'he server encountered an error whilst importing data.');
+        super(payload, 'The server encountered an error whilst importing data.');
     }
 }
 
@@ -271,7 +271,7 @@ class ajaxService extends AjaxService {
                 success = true;
 
                 if (attempts !== 0 && this.config.sentry_dsn) {
-                    captureMessage('Request took multiple attempts', {extra: getErrorData()});
+                    Sentry.captureMessage('Request took multiple attempts', {extra: getErrorData()});
                 }
 
                 return result;
@@ -289,7 +289,7 @@ class ajaxService extends AjaxService {
                     await timeout(retryPeriods[attempts] || retryPeriods[retryPeriods.length - 1]);
                     attempts += 1;
                 } else if (attempts > 0 && this.config.sentry_dsn) {
-                    captureMessage('Request failed after multiple attempts', {extra: getErrorData()});
+                    Sentry.captureMessage('Request failed after multiple attempts', {extra: getErrorData()});
                     throw error;
                 } else {
                     throw error;
@@ -299,6 +299,16 @@ class ajaxService extends AjaxService {
     }
 
     handleResponse(status, headers, payload, request) {
+        // set some context variables for Sentry in case there is an error
+        Sentry.setContext('ajax', {
+            url: request.url,
+            method: request.method,
+            status
+        });
+        Sentry.setTag('ajax_status', status);
+        Sentry.setTag('ajax_url', request.url);
+        Sentry.setTag('ajax_method', request.method);
+
         if (headers['content-version']) {
             const contentVersion = semverCoerce(headers['content-version']);
             const appVersion = semverCoerce(config.APP.version);
diff --git a/ghost/admin/app/services/dashboard-stats.js b/ghost/admin/app/services/dashboard-stats.js
index 7ab37b65f03..f1b2b384f9a 100644
--- a/ghost/admin/app/services/dashboard-stats.js
+++ b/ghost/admin/app/services/dashboard-stats.js
@@ -57,8 +57,8 @@ import {tracked} from '@glimmer/tracking';
 /**
  * @typedef PaidMembersByCadence
  * @type {Object}
- * @property {number} year Paid memebrs on annual plan
- * @property {number} month Paid memebrs on monthly plan
+ * @property {number} year Paid members on annual plan
+ * @property {number} month Paid members on monthly plan
  */
 
 /**
diff --git a/ghost/admin/app/services/notifications.js b/ghost/admin/app/services/notifications.js
index b0d9e31073f..2393826a54d 100644
--- a/ghost/admin/app/services/notifications.js
+++ b/ghost/admin/app/services/notifications.js
@@ -34,6 +34,8 @@ const GENERIC_ERROR_NAMES = [
     'SyntaxError',
     'TypeError',
     'URIError',
+    // ember-ajax errors - https://github.com/ember-cli/ember-ajax/blob/master/addon/errors.ts
+    'AjaxError',
     'ServerError'
 ];
 
diff --git a/ghost/admin/app/services/ui.js b/ghost/admin/app/services/ui.js
index 0af3285704a..f291d0830eb 100644
--- a/ghost/admin/app/services/ui.js
+++ b/ghost/admin/app/services/ui.js
@@ -48,7 +48,6 @@ export default class UiService extends Service {
 
     @inject config;
 
-    @tracked contextualNavMenu = null;
     @tracked isFullScreen = false;
     @tracked mainClass = '';
     @tracked showMobileMenu = false;
diff --git a/ghost/admin/app/styles/app-dark.css b/ghost/admin/app/styles/app-dark.css
index 18342e2cc80..1faed6eb5b0 100644
--- a/ghost/admin/app/styles/app-dark.css
+++ b/ghost/admin/app/styles/app-dark.css
@@ -42,6 +42,8 @@
 @import "components/stacks.css";
 @import "components/browser-preview.css";
 @import "components/filter-builder.css";
+@import "components/theme-errors.css";
+@import "components/modal-about.css";
 
 
 /* Layouts
@@ -51,19 +53,12 @@
 @import "layouts/auth.css";
 @import "layouts/content.css";
 @import "layouts/editor.css";
-@import "layouts/settings.css";
-@import "layouts/users.css";
-@import "layouts/user.css";
 @import "layouts/whatsnew.css";
 @import "layouts/tags.css";
 @import "layouts/members.css";
 @import "layouts/member-activity.css";
 @import "layouts/error.css";
-@import "layouts/apps.css";
-@import "layouts/packages.css";
-@import "layouts/labs.css";
 @import "layouts/preview-email.css";
-@import "layouts/portal-settings.css";
 @import "layouts/billing.css";
 @import "layouts/post-history.css";
 @import "layouts/post-preview.css";
@@ -527,7 +522,6 @@ input:focus,
 }
 
 .gh-about-logo svg,
-.apps-card-app-orb,
 .gh-nav-logo-default,
 .gh-unsplash-logo {
     filter: invert(100%) brightness(150%);
@@ -553,10 +547,6 @@ input:focus,
     background: #fff;
 }
 
-.user-cover-edit {
-    color: #fff;
-}
-
 .gh-unsplash-search:focus {
     background-color: color-mod(var(--lightgrey));
 }
@@ -583,33 +573,6 @@ input:focus,
     color: var(--darkgrey);
 }
 
-.apps-grid,
-.apps-grid-cell {
-    background: var(--dark-main-bg-color);
-}
-
-.td-item-overlay:hover,
-.td-item-overlay:focus {
-    background-color: var(--black-90);
-}
-
-.td-item-empty {
-    background: var(--whitegrey-l1);
-}
-
-.gh-themes-container {
-    background: var(--whitegrey-l2);
-}
-
-.gh-themes-container .apps-grid {
-    background: none;
-}
-
-.gh-theme-directory-footer {
-    color: var(--darkgrey);
-    background-color: var(--whitegrey);
-}
-
 .settings-code-editor .CodeMirror-gutters,
 .settings-code code,
 .form-group code {
@@ -634,26 +597,6 @@ input:focus,
     border-color: var(--midgrey);
 }
 
-.gh-branding-settings-right {
-    background: var(--dark-main-bg-color);
-}
-
-.gh-branding-settings-header {
-    border-bottom: 1px solid var(--hairline-color-1);
-}
-
-.gh-branding-settings-options {
-    border-right: 1px solid var(--hairline-color-1);
-}
-
-.gh-branding-image-container.transparent-bg {
-    background-image: url("data:image/svg+xml,%3Csvg width='24' height='24' viewBox='0 0 24 24' xmlns='http://www.w3.org/2000/svg'%3E%3Ctitle%3ERectangle%3C/title%3E%3Cg fill='none' fill-rule='evenodd'%3E%3Cpath fill='%23303e46' d='M0 0h24v24H0z'/%3E%3Cpath fill='%233e515b' d='M0 0h12v12H0zM12 12h12v12H12z'/%3E%3C/g%3E%3C/svg%3E");
-}
-
-.id-item {
-    background: var(--dark-main-bg-color);
-}
-
 .CodeMirror .cm-spell-error:not(.cm-url):not(.cm-comment):not(.cm-tag):not(.cm-word) {
     background: rgba(255, 0, 0, .30);
 }
@@ -678,14 +621,6 @@ input:focus,
     color: color-mod(#5A5CAD l(+20%));
 }
 
-.id-github img,
-.id-typeform img,
-.id-buffer img,
-.id-unsplash,
-.id-more img {
-    filter: invert(100%);
-}
-
 .dark-no-shadow {
     box-shadow: none;
 }
@@ -718,29 +653,12 @@ input:focus,
     background: var(--lightgrey);
 }
 
-.apps-grid-cell:hover {
-    background: var(--whitegrey);
-}
-
-.apps-card-app {
-    border-bottom: var(--hairline-color-1) 1px solid;
-}
-
-.apps-card-app-icon {
-    mix-blend-mode: normal;
-}
-
-.apps-card-app-icon.id-typeform {
-    filter: invert(100%);
-}
-
 .gh-nav,
 .gh-contentfilter-menu-trigger,
 .gh-contentfilter-menu-trigger--active,
 .gh-contentfilter-menu-trigger:focus,
 .tags-container,
-.content-list ol,
-.gh-settings-main-grid {
+.content-list ol {
     background: var(--dark-main-bg-color);
 }
 
@@ -788,14 +706,6 @@ input:focus,
     background-color: transparent;
 }
 
-.gh-setting-header {
-    border-color: var(--hairline-color-1);
-}
-
-.gh-settings-main-grid .gh-setting-group span {
-    background: color-mod(var(--dark-main-bg-color) l(+2%));
-}
-
 .gh-referral-toast-close:hover {
     color: #fff;
 }
@@ -979,7 +889,6 @@ input:focus,
     background: none !important;
 }
 
-.modal-fullsettings-preview-container,
 .fullscreen-modal-email-preview .gh-pe-mobile-container,
 .fullscreen-modal-email-preview .gh-pe-desktop-container{
     background: var(--dark-main-bg-color);
@@ -991,10 +900,6 @@ input:focus,
     background: transparent;
 }
 
-.modal-fullsettings-main {
-    border-left: 1px solid var(--hairline-color-1);
-}
-
 .gh-pe-mobile-bezel {
     background: var(--lightgrey-l2);
 }
@@ -1007,11 +912,6 @@ input:focus,
     border: 1px solid var(--hairline-color-1);
 }
 
-.gh-members-connect-testmodelabel {
-    background: #983705;
-    color: #f8e5b9;
-}
-
 .members-list .gh-list-header {
     background: var(--dark-main-bg-color);
 }
@@ -1136,10 +1036,6 @@ input:focus,
     background: rgb(55, 59, 67, 0.99);
 }
 
-.user-image {
-    border-color: var(--dark-main-bg-color);
-}
-
 .gh-whats-new-badge-account {
     top: 0;
     right: -2px;
@@ -1326,18 +1222,6 @@ kbd {
     color: #4d4f52;
 }
 
-.gh-input-group-tier-trial-disabled .gh-input-append {
-    background: #0e0f11;
-    color: #4c4f52;
-    border-color: #17191c;
-    opacity: 1;
-}
-
-.gh-input-group-tier-trial-disabled .gh-input-append:before {
-    background: #0e0f11;
-}
-
-
 /* Settings Links */
 
 .kg-settings-link-url::before {
@@ -1476,9 +1360,3 @@ kbd {
 .gh-update-banner {
     background: var(--main-color-content-greybg);
 }
-
-/* Staff */
-.gh-roles-container .popover {
-    background: var(--dark-main-bg-color);
-    box-shadow: 0 0 1px rgba(0,0,0,.65), 0 8px 28px rgba(0,0,0,.72);
-}
diff --git a/ghost/admin/app/styles/app.css b/ghost/admin/app/styles/app.css
index 1d8de82c86c..e4baaa03aee 100644
--- a/ghost/admin/app/styles/app.css
+++ b/ghost/admin/app/styles/app.css
@@ -44,6 +44,8 @@
 @import "components/browser-preview.css";
 @import "components/filter-builder.css";
 @import "components/pintura.css";
+@import "components/theme-errors.css";
+@import "components/modal-about.css";
 
 
 /* Layouts
@@ -53,20 +55,13 @@
 @import "layouts/auth.css";
 @import "layouts/content.css";
 @import "layouts/editor.css";
-@import "layouts/settings.css";
-@import "layouts/users.css";
-@import "layouts/user.css";
 @import "layouts/whatsnew.css";
 @import "layouts/tags.css";
 @import "layouts/members.css";
 @import "layouts/posts.css";
 @import "layouts/member-activity.css";
 @import "layouts/error.css";
-@import "layouts/apps.css";
-@import "layouts/packages.css";
-@import "layouts/labs.css";
 @import "layouts/preview-email.css";
-@import "layouts/portal-settings.css";
 @import "layouts/billing.css";
 @import "layouts/post-history.css";
 @import "layouts/post-preview.css";
diff --git a/ghost/admin/app/styles/components/modal-about.css b/ghost/admin/app/styles/components/modal-about.css
new file mode 100644
index 00000000000..ae20aa34938
--- /dev/null
+++ b/ghost/admin/app/styles/components/modal-about.css
@@ -0,0 +1,152 @@
+.gh-about-logo svg {
+    position: relative;
+    width: 120px;
+    height: auto;
+}
+
+.gh-about-logo {
+    border-bottom: 1px solid var(--lightgrey-l2);
+    padding-bottom: 10px;
+    margin-bottom: 16px;
+}
+
+.gh-about-modal .gh-about-logo {
+    margin: 4px 0 20px;
+    border-bottom: none;
+    padding-bottom: 0;
+}
+
+.gh-about-container {
+    display: grid;
+    grid-template-columns: 2fr 1fr;
+    grid-gap: 80px;
+}
+
+.gh-whats-new-canvas .gh-about-container {
+    display: flex;
+    grid-template-columns: unset;
+    grid-gap: unset;
+    margin: 0 auto;
+    max-width: 920px;
+    margin-top: 60px;
+}
+
+.gh-about-box {
+    position: sticky;
+    top: 96px;
+    right: 0;
+    display: flex;
+    flex-grow: 1;
+    flex-direction: column;
+    height: max-content;
+    border-radius: 3px;
+    min-width: 300px;
+}
+
+.gh-about-box.grey {
+    border: none;
+    background: var(--main-color-content-greybg);
+}
+
+.gh-env-details {
+    display: flex;
+    flex-grow: 1;
+    flex-direction: column;
+    padding: 24px 28px 28px;
+}
+
+.gh-about-container h2 {
+    font-size: 1.65rem;
+    line-height: 1.4em;
+    font-weight: 600;
+    border-bottom: 1px solid var(--lightgrey-l2);
+    padding-bottom: 12px;
+    margin-bottom: 12px;
+}
+
+.gh-env-list {
+    margin: 0;
+    padding: 0;
+    list-style: none;
+}
+
+.gh-env-list li {
+    margin: 0 0 4px;
+    font-size: 1.4rem;
+    line-height: 1.5em;
+}
+
+.gh-env-error {
+    margin: 1.2rem 0;
+    padding: 16px;
+    line-height: 1.4em;
+    border: none;
+    background: color-mod(var(--red) a(6%));
+    border-radius: 3px;
+}
+
+.gh-env-error a {
+    color: var(--red);
+}
+
+.gh-env-help {
+    max-width: 200px;
+}
+
+.gh-env-help .gh-btn {
+    margin: 4px 0;
+}
+
+@media (max-width: 670px) {
+    .gh-env-details {
+        flex-direction: column;
+    }
+    .gh-env-help {
+        margin: 1em 0;
+        max-width: none;
+    }
+    .gh-env-help .gh-btn {
+        display: inline-block;
+    }
+}
+
+.gh-about-content-actions {
+    display: none;
+}
+
+
+
+/* Upgrade
+/* ---------------------------------------------------------- */
+
+.gh-upgrade-notification {
+    padding-top: 1em;
+}
+
+.gh-upgrade-notification a {
+    text-decoration: underline;
+}
+
+.gh-about-modal .gh-upgrade-notification {
+    background: color-mod(var(--green) a(8%));
+    padding: 24px 28px 24px;
+    border-radius: 3px;
+    margin-bottom: 28px;
+}
+
+/* Copyright Info
+/* ---------------------------------------------------------- */
+
+.gh-copyright-info {
+    color: var(--midgrey);
+    font-size: 1.3rem;
+    border-top: 1px solid var(--lightgrey-l2);
+    padding-top: 16px;
+    margin-top: 16px;
+    line-height: 1.45em;
+}
+
+.gh-about-modal .gh-copyright-info {
+    margin: 4px 0 8px;
+    border-top: none;
+}
diff --git a/ghost/admin/app/styles/components/modals.css b/ghost/admin/app/styles/components/modals.css
index f8fe2c12f9d..020294a2fb6 100644
--- a/ghost/admin/app/styles/components/modals.css
+++ b/ghost/admin/app/styles/components/modals.css
@@ -262,285 +262,6 @@
     background: var(--whitegrey-l2);
 }
 
-
-
-/* Full screen setting modal with preview. Used in e.g. Portal
-/* settings, Email design settings etc.
-/* ---------------------------------------------------------- */
-.modal-fullsettings {
-    height: 100%;
-    display: flex;
-    flex-direction: column;
-}
-
-.modal-fullsettings-body {
-    display: flex;
-    padding: 0;
-    flex-grow: 1;
-    overflow: hidden;
-}
-
-.modal-fullsettings-body .form-group.space-l {
-    margin-bottom: 1.9em;
-}
-
-.modal-fullsettings-body .for-switch.small {
-    width: 36px !important;
-    height: 22px !important;
-}
-
-.modal-fullsettings-body .gh-select svg {
-    top: 19px;
-    right: 9px;
-}
-
-.modal-fullsettings-body .modal-footer {
-    margin-top: 28px;
-}
-
-.modal-fullsettings-sidebar {
-    display: flex;
-    flex-direction: column;
-    padding: 0px 24px 20px;
-    width: 420px;
-    overflow-y: auto;
-}
-
-.modal-fullsettings-sidebar.with-footer {
-    justify-content: space-between;
-}
-
-.modal-fullsettings-topbar {
-    height: 66px;
-    padding: 0 24px;
-    border-bottom: 1px solid var(--whitegrey);
-}
-
-.modal-fullsettings-heading {
-    display: flex;
-    align-items: center;
-    height: 66px;
-    font-size: 1.9rem;
-    font-weight: 600;
-    padding: 0 24px;
-    margin: 0 -24px 1px;
-}
-
-.modal-fullsettings-form {
-    min-width: 292px;
-}
-
-.modal-fullsettings-section {
-    margin: 24px -24px;
-    padding: 0 24px;
-}
-
-.modal-fullsettings-section.divider-top {
-    border-top: 1px solid var(--whitegrey);
-    padding-top: 24px;
-}
-
-.modal-fullsettings-sectionheading {
-    font-size: 1.2rem;
-    font-weight: 500;
-    color: var(--midlightgrey);
-    margin: 0 0 12px;
-    text-transform: uppercase;
-    letter-spacing: 0.2px;
-}
-
-.modal-fullsettings-section .form-group {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    padding: 0;
-    margin-bottom: 20px;
-}
-
-.modal-fullsettings-section .form-group > p {
-    font-size: 1.25rem !important;
-    line-height: 1.4em;
-}
-
-.modal-fullsettings-section .form-group.vertical {
-    display: block;
-}
-
-.modal-fullsettings-section .form-group.vertical h4 {
-    margin-bottom: 8px;
-}
-
-.modal-fullsettings-section .form-group.vertical p {
-    margin-top: 8px;
-}
-
-.modal-fullsettings-section .gh-select select,
-.modal-fullsettings-section textarea {
-    font-size: 1.4rem;
-}
-
-.modal-fullsettings-radiogroup {
-    margin: 0;
-}
-
-.modal-fullsettings-radiogroup .gh-radio {
-    margin-bottom: 14px;
-}
-
-.modal-fullsettings-radiogroup .gh-radio:last-of-type {
-    margin-bottom: 12px;
-}
-
-.modal-fullsettings-radiogroup + p {
-    margin-top: 4px !important;
-    margin-bottom: 28px;
-}
-
-.modal-fullsettings-title {
-    font-size: 1.3rem;
-    font-weight: 600;
-    margin: 0 12px 0 0;
-}
-
-.modal-fullsettings-title.disabled {
-    opacity: .5;
-}
-
-.modal-fullsettings-uploader {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    margin: 18px 0 0;
-    border-radius: 3px;
-}
-
-.gh-header-img-container {
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    width: 64px;
-    height: 44px;
-}
-
-.gh-header-img-container .gh-loading-spinner {
-    width: 20px;
-    height: 20px;
-}
-
-.gh-header-img-uploadicon,
-.gh-header-img-uploadicon:hover,
-.gh-header-img-uploadicon:focus {
-    width: 64px;
-    height: 44px;
-    border: 1px dashed var(--lightgrey);
-    background: transparent;
-    box-shadow: none;
-}
-
-.gh-header-img-uploadicon span {
-    display: flex;
-    justify-content: center;
-    align-items: center;
-}
-
-.gh-header-img-uploadicon span svg {
-    width: 18px;
-    height: 18px;
-    fill: var(--black);
-}
-
-.gh-header-img-uploadicon:hover span svg {
-    fill: var(--green-d1);
-}
-
-.gh-header-img {
-    height: 44px;
-}
-
-.gh-header-img-thumbnail {
-    display: inline-block;
-    width: 64px;
-    height: 44px;
-    border: 1px solid var(--whitegrey);
-    cursor: pointer;
-    background-position: center;
-    object-fit: cover;
-    border-radius: 3px;
-}
-
-.gh-header-img-thumbnail svg path {
-    stroke: var(--midlightgrey-d1);
-}
-
-.gh-header-img-deleteicon {
-    position: absolute;
-    right: 0;
-    width:64px;
-    height: 44px;
-    background: var(--black) !important;
-    opacity: 0;
-    color: var(--whitegrey-d1);
-}
-
-.gh-header-img-deleteicon:hover {
-    opacity: 1;
-    color: var(--whitegrey-d1);
-}
-
-.gh-header-img-deleteicon span {
-    display: flex;
-    justify-content: center;
-    align-items: center;
-}
-
-.gh-header-img-deleteicon span svg {
-    width: 18px;
-    height: 18px;
-}
-
-.modal-fullsettings-uploader h4 {
-    margin: 0 !important;
-    padding: 0;
-    font-size: 1.3rem;
-    line-height: 1.65em;
-}
-
-.modal-fullsettings-uploader p {
-    margin: 0 !important;
-    padding: 0;
-    font-size: 1.2rem !important;
-}
-
-.modal-fullsettings-main {
-    display: flex;
-    flex-direction: column;
-    flex-grow: 1;
-    padding: 0;
-    border-left: 1px solid var(--whitegrey);
-}
-
-.modal-fullsettings-preview-container {
-    overflow: hidden;
-    background: var(--whitegrey-l1);
-    height: 100vh;
-    overflow-y: scroll;
-}
-
-.modal-fullsettings-preview-hidescrollbar {
-    overflow: hidden;
-    height: 100vh;
-    background: var(--whitegrey-l1);
-    border: 1px solid var(--whitegrey);
-    border-radius: 5px;
-}
-
-.modal-fullsettings-preview-hidescrollbar .modal-fullsettings-preview-container {
-    border: none;
-    border-radius: 0;
-    margin: 0 -50px;
-    padding: 0 50px;
-}
-
 /* Content Modifiers
 /* ---------------------------------------------------------- */
 
@@ -596,186 +317,6 @@
     }
 }
 
-/* Fullscreen Modal Labs
-/* ---------------------------------------------------------- */
-
-.modal-fullsettings-sidebar-labs {
-    display: flex;
-    flex-direction: column;
-    width: 400px;
-    overflow-y: auto;
-}
-
-.modal-fullsettings-heading-labs {
-    display: flex;
-    align-items: center;
-    margin: 0;
-    padding: 32px;
-    font-size: 2rem;
-    font-weight: 600;
-}
-
-.modal-fullsettings-body-labs {
-    display: flex;
-    flex-direction: column;
-    flex-grow: 1;
-    justify-content: space-between;
-    overflow: hidden;
-    overflow-y: auto;
-    overflow-x: hidden;
-}
-
-.modal-fullsettings-section-labs {
-    display: flex;
-    flex-direction: column;
-    justify-content: space-between;
-    flex-grow: 1;
-    padding: 0;
-    margin-bottom: 24px;
-}
-
-.modal-fullsettings-section-title {
-    margin: 0 16px 4px;
-    padding: 8px 16px;
-    color: var(--black);
-    font-size: 1.5rem;
-    letter-spacing: 0;
-    font-weight: 600;
-    line-height: 1.3em;
-}
-
-.modal-fullsettings-tab {
-    display: flex;
-    flex-grow: 1;
-    position: relative;
-    align-items: center;
-    box-sizing: border-box;
-    padding: 7px var(--main-layout-area-padding);
-    color: var(--darkgrey-l1);
-    font-weight: 400;
-    font-size: 1.45rem;
-    transition: none;
-    z-index: 0;
-}
-
-.modal-fullsettings-tab:hover {
-    color: var(--black);
-}
-
-.modal-fullsettings-tab.active {
-    color: var(--black);
-    font-weight: 400;
-    border-radius: var(--border-radius) var(--border-radius) 0 0;
-}
-
-.modal-fullsettings-tab:not(.active):hover {
-    background: var(--mainmenu-color-hover-bg);
-}
-
-.modal-fullsettings-form-labs .modal-fullsettings-tab svg {
-    margin-right: 17px;
-    width: 16px;
-    height: 16px;
-    line-height: 1;
-    transition: none;
-    z-index: 999;
-}
-
-.modal-fullsettings-tab-expanded {
-    margin: 8px 0 24px;
-    padding: 24px var(--main-layout-area-padding) 16px;
-    background: var(--mainmenu-color-hover-bg);
-}
-
-.modal-fullsettings-tab-expanded .gh-setting {
-    padding: 12px 0;
-}
-
-.modal-fullsettings-tab-expanded .gh-setting.gh-setting-extra {
-    padding-bottom: 24px;
-}
-
-.modal-fullsettings-tab-expanded .gh-setting-first {
-    padding-top: 0;
-}
-
-.modal-fullsettings-form-labs .for-checkbox .input-toggle-component {
-    background: var(--white);
-}
-
-.modal-fullsettings-form-labs .gh-nav-button-expand {
-    position: relative;
-    top: inherit;
-    left: inherit;
-    margin: 0 8px 0 auto;
-    padding-top: 3px;
-}
-
-.modal-fullsettings-form-labs .gh-nav-button-expand svg {
-    margin-right: 0;
-}
-
-.modal-fullsettings-main-topbar-labs {
-    display: flex;
-    align-items: center;
-    justify-content: flex-end;
-    position: relative;
-    width: 100%;
-    height: 90px;
-    padding: 2.4rem;
-}
-
-.modal-fullsettings-bottom {
-    position: sticky;
-    -webkit-position: sticky;
-    bottom: -24px;
-    z-index: 9997;
-    height: 164px;
-    -webkit-backface-visibility: hidden;
-}
-
-.modal-fullsettings-bottom::before,
-.modal-fullsettings-bottom::after {
-  content: "";
-  position: sticky;
-  -webkit-position: sticky;
-  display: block;
-  height: 24px;
-}
-
-.modal-fullsettings-bottom::before {
-    z-index: 9998;
-    bottom: 0;
-    background: var(--white);
-}
-
-.modal-fullsettings-bottom::after {
-    bottom: 116px;
-    box-shadow: 0 0 0 1px rgba(0,0,0,.04), 0 -8px 16px -3px rgba(0,0,0,.15);
-}
-
-.modal-fullsettings-footer {
-    position: sticky;
-    -webkit-position: sticky;
-    bottom: 0;
-    z-index: 9999;
-    display: flex;
-    align-items: center;
-    height: 140px;
-    margin-bottom: -24px;
-    padding: var(--main-layout-area-padding);
-    background: var(--white);
-}
-
-.modal-fullsettings-footer .form-group {
-    display: flex;
-    justify-content: space-between;
-    align-items: flex-start;
-    padding: 0;
-    margin-bottom: 0;
-}
-
-
 /* Re-authentication modal (cookies expired with unsaved changes in editor)
 /* ---------------------------------------------------------- */
 
diff --git a/ghost/admin/app/styles/components/power-select.css b/ghost/admin/app/styles/components/power-select.css
index 4df322891fa..c2f3cd4dfde 100644
--- a/ghost/admin/app/styles/components/power-select.css
+++ b/ghost/admin/app/styles/components/power-select.css
@@ -9,7 +9,7 @@
     border: var(--input-border);
 }
 
-.ember-power-select-trigger:not(.gh-setting-dropdown):not(.ember-power-select-multiple-trigger):not(.gh-preview-newsletter-trigger) svg {
+.ember-power-select-trigger:not(.ember-power-select-multiple-trigger):not(.gh-preview-newsletter-trigger) svg {
     height: 4px;
     width: 6.11px;
     margin-left: 2px;
@@ -17,7 +17,7 @@
     vertical-align: middle;
 }
 
-.ember-power-select-trigger:not(.gh-setting-dropdown):not(.ember-power-select-multiple-trigger) svg path {
+.ember-power-select-trigger:not(.ember-power-select-multiple-trigger) svg path {
     stroke: var(--darkgrey);
 }
 
diff --git a/ghost/admin/app/styles/components/settings-menu.css b/ghost/admin/app/styles/components/settings-menu.css
index cbba8de544c..29f3440976c 100644
--- a/ghost/admin/app/styles/components/settings-menu.css
+++ b/ghost/admin/app/styles/components/settings-menu.css
@@ -535,13 +535,6 @@ li.nav-list-item .for-switch.x-small label {
     transform: translate3d(205px, 0px, 0px);
 }
 
-
-/* Badges
-/* ---------------------------------------------------------- */
-.gh-setting-title .gh-badge {
-    font-size: 13px;
-}
-
 /* Email
 /* ---------------------------------------------------------- */
 .settings-menu-email-button span {
diff --git a/ghost/admin/app/styles/components/stacks.css b/ghost/admin/app/styles/components/stacks.css
index 4f184d0e529..1c726fabb3f 100644
--- a/ghost/admin/app/styles/components/stacks.css
+++ b/ghost/admin/app/styles/components/stacks.css
@@ -1,4 +1,4 @@
-/* Lists that are open on the sides 
+/* Lists that are open on the sides
 /* ------------------------------------------------- */
 .gh-stack {
     display: flex;
@@ -19,10 +19,6 @@
     justify-content: space-between;
 }
 
-.gh-stack-item .gh-setting-content {
-    margin-right: 24px;
-}
-
 .gh-stack-item.row label {
     margin-bottom: 0;
-}
\ No newline at end of file
+}
diff --git a/ghost/admin/app/styles/components/theme-errors.css b/ghost/admin/app/styles/components/theme-errors.css
new file mode 100644
index 00000000000..29d4b6c01e7
--- /dev/null
+++ b/ghost/admin/app/styles/components/theme-errors.css
@@ -0,0 +1,148 @@
+/*Errors */
+.theme-validation-container {
+    overflow-y: auto;
+    margin: -32px -32px 0;
+    padding: 32px 32px 0;
+    max-height: calc(100vh - 20vw);
+}
+
+@media (max-height: 960px) {
+    .theme-validation-container {
+        max-height: calc(100vh - 180px);
+    }
+}
+
+.theme-validation-container .gh-image-uploader {
+    justify-content: center;
+}
+
+.theme-validation-container .gh-image-uploader .description {
+    color: var(--green-d1);
+    font-weight: 500;
+}
+
+.theme-validation-container .gh-image-uploader .x-file-input.try-again,
+.theme-validation-container .gh-image-uploader .x-file-input.try-again label {
+    display: inline;
+}
+
+.theme-validation-item {
+    margin: 12px 0 0;
+    padding: 12px 16px 12px 28px;
+    border: 1px solid #e5eff5;
+    border-radius: 5px;
+    display: flex;
+    flex-direction: column;
+    border: 1px solid var(--lightgrey);
+}
+
+.theme-validation-item h4 {
+    margin: 0;
+    font-size: 1.4rem;
+    font-weight: 400;
+    line-height: 1.5em;
+}
+
+.theme-validation-rule-text {
+    flex-grow: 1;
+}
+
+.theme-validation-item.theme-fatal-error {
+    border: 1px solid var(--red);
+}
+
+.theme-validation-item.theme-fatal-error .theme-validation-rule-text::before,
+.theme-validation-item.theme-error .theme-validation-rule-text::before,
+.theme-validation-item.theme-warning .theme-validation-rule-text::before
+{
+    font-weight: 600;
+}
+
+.theme-validation-item.theme-fatal-error .theme-validation-rule-text::before {
+    content: "Fatal error:";
+    color: var(--red);
+}
+
+.theme-validation-item.theme-error .theme-validation-rule-text::before {
+    content: "Error:";
+}
+
+.theme-validation-item.theme-warning .theme-validation-rule-text::before {
+    content: "Warning:";
+}
+
+.theme-fatal-error .theme-validation-type-label::before,
+.theme-error .theme-validation-type-label::before,
+.theme-warning .theme-validation-type-label::before {
+    content: "";
+    display: block;
+    width: 8px;
+    height: 8px;
+    margin-top: 6px;
+    margin-left: -16px;
+    border-radius: 999px;
+}
+
+.theme-fatal-error .theme-validation-type-label::before,
+.theme-error .theme-validation-type-label::before {
+    background: color-mod(var(--red) alpha(0.85));
+}
+
+.theme-warning .theme-validation-type-label::before {
+    background: color-mod(var(--yellow));
+}
+
+.theme-validation-list ul {
+    list-style: disc;
+}
+
+.theme-validation-list code,
+.theme-validation-rule-text code {
+    font-size: 0.9em;
+}
+
+.theme-validation-item h6 {
+    font-size: 1.3rem;
+    font-weight: 500;
+}
+
+.theme-validation-toggle-details {
+    display: flex;
+    justify-content: space-between;
+    flex-grow: 1;
+    align-items: flex-start;
+    padding: 0;
+    color: var(--darkgrey);
+    text-decoration: none!important;
+    font-size: 1.3rem;
+}
+
+.theme-validation-rule-icon {
+    flex-shrink: 0;
+    margin-left: 5px;
+    width: 13px;
+    height: 14px;
+    color: var(--midgrey);
+    transition: all 0.1s ease-out;
+}
+
+.theme-validation-rule-icon svg path {
+    fill: var(--midgrey);
+}
+
+.theme-validation-details {
+    margin-top: 12px;
+    padding-top: 12px;
+    font-size: 1.3rem;
+    border-top: 1px solid var(--lightgrey);
+}
+
+p.theme-validation-details {
+    font-size: 1.3rem;
+}
+
+.theme-validation-screenshot img {
+    margin-bottom: 2rem;
+    border: 1px solid var(--main-color-area-divider);
+    border-radius: 3px;
+}
diff --git a/ghost/admin/app/styles/components/uploader.css b/ghost/admin/app/styles/components/uploader.css
index a52217e224c..e220e34fe0f 100644
--- a/ghost/admin/app/styles/components/uploader.css
+++ b/ghost/admin/app/styles/components/uploader.css
@@ -130,7 +130,7 @@
     color: color-mod(var(--midgrey));
 }
 
-/* TODO: remove the gh-image-uploader classes once it's using gh-progrss-bar */
+/* TODO: remove the gh-image-uploader classes once it's using gh-progress-bar */
 .gh-image-uploader .progress-container,
 .gh-progress-container {
     flex-grow: 1;
diff --git a/ghost/admin/app/styles/layouts/apps.css b/ghost/admin/app/styles/layouts/apps.css
deleted file mode 100644
index ec393c60d95..00000000000
--- a/ghost/admin/app/styles/layouts/apps.css
+++ /dev/null
@@ -1,645 +0,0 @@
-/* Apps
-/* ---------------------------------------------------------- */
-
-.apps-filter {
-    border-radius: 5px;
-}
-@media (max-width: 1460px) {
-    .apps-filter {
-        max-width: 700px;
-    }
-}
-
-/* Main Layout
-/* ---------------------------------------------------------- */
-
-.integrations-directory {
-    display: grid;
-    justify-content: space-between;
-    grid-template-columns: 1fr 1fr 1fr 1fr 1fr 1fr 1fr 1fr;
-    grid-gap: 25px;
-    background: var(--whitegrey-l1);
-    padding: 24px;
-    border-radius: 3px;
-}
-
-.id-item {
-    display: flex;
-    flex-direction: column;
-    justify-content: center;
-    align-items: center;
-    width: 100%;
-    height: 100px;
-    padding: 10px;
-    text-align: center;
-    text-decoration: none;
-    color: var(--darkgrey);
-    border-radius: 5px;
-    box-shadow: 0 3px 6px -2px rgba(0,0,0,.1);
-    background: var(--white);
-    transition: all .5s ease;
-}
-
-.id-item:hover {
-    transform: translateY(-2.5%);
-    box-shadow: 0 0 1px rgba(0,0,0,.02), 0 8px 26px -4px rgba(0,0,0,.08);
-    transition: all .3s ease;
-}
-
-.id-item-logo {
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    height: 38px;
-    width: 38px;
-    margin-top: 4px;
-}
-
-.id-more svg circle {
-    stroke: var(--midlightgrey);
-}
-
-@media (max-width: 1320px) {
-    .integrations-directory {
-        grid-template-columns: 1fr 1fr 1fr 1fr 1fr 1fr 1fr;
-    }
-    .id-item:nth-child(7) {
-        display: none;
-    }
-}
-@media (max-width: 1160px) {
-    .integrations-directory {
-        grid-template-columns: 1fr 1fr 1fr 1fr 1fr 1fr;
-    }
-    .id-item:nth-child(6) {
-        display: none;
-    }
-}
-@media (max-width: 1020px) {
-    .integrations-directory {
-        grid-template-columns: 1fr 1fr 1fr 1fr 1fr;
-    }
-    .id-item:nth-child(5) {
-        display: none;
-    }
-}
-@media (max-width: 900px) {
-    .integrations-directory {
-        grid-template-columns: 1fr 1fr 1fr 1fr;
-    }
-    .id-item:nth-child(5),
-    .id-item:nth-child(6),
-    .id-item:nth-child(7) {
-        display: flex;
-    }
-}
-
-@media (max-width: 500px) {
-    .integrations-directory {
-        grid-template-columns: 1fr 1fr 1fr;
-    }
-    .id-item:nth-child(6),
-    .id-item:nth-child(7) {
-        display: none;
-    }
-}
-
-/* Built-in integrations */
-.apps-first-header,
-.apps-first-header .apps-grid-title {
-    margin-top: 0px;
-}
-
-.apps-grid {
-    display: flex;
-    flex-flow: row wrap;
-    align-items: flex-start;
-}
-
-.apps-grid-note {
-    display: block;
-    margin-top: 5px;
-    color: var(--midgrey);
-    font-size: 1.2rem;
-    font-style: italic;
-}
-
-/* Apps Card
-/* ---------------------------------------------------------- */
-
-.apps-grid-cell {
-    flex: 1 1 100%;
-    background: var(--white);
-    margin: 0;
-}
-
-.apps-grid-cell {
-    transition: background 0.3s ease;
-}
-
-.apps-grid-cell:hover {
-    background: var(--whitegrey-l2);
-    transition: none;
-}
-
-.apps-card-app {
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    overflow: hidden;
-    padding: 16px 4px;
-    height: 65px;
-    border-bottom: var(--whitegrey) 1px solid;
-    transition: background 0.3s ease;
-}
-
-.new-integration-cell .apps-card-app {
-    padding: 10px 16px;
-    height: auto;
-}
-
-@media (max-width: 500px) {
-    .apps-card-app {
-        min-height: 75px;
-        height: auto;
-    }
-
-    .new-integration-cell .apps-card-app {
-        min-height: auto;
-        height: auto;
-    }
-}
-
-.apps-grid-cell:first-of-type .apps-card-app {
-    border-top: none;
-}
-
-.apps-card-left {
-    display: flex;
-    align-items: center;
-}
-
-@media (max-width: 500px) {
-    .apps-card-left {
-        flex-basis: 70%;
-    }
-}
-
-.apps-card-right {
-    display: flex;
-    align-items: center;
-}
-
-.apps-card-right svg {
-    margin-left: 15px;
-    height: 14px;
-}
-
-.apps-card-right svg path {
-    fill: var(--midgrey);
-}
-
-.apps-configured {
-    display: flex;
-    align-items: center;
-    color: var(--midgrey);
-    font-weight: 400;
-}
-
-.apps-configured svg {
-    margin-left: 15px;
-    height: 14px;
-}
-
-.apps-configured svg path {
-    fill: var(--midgrey);
-}
-
-.apps-configured a {
-    display: inline-block;
-    padding: 2px 6px;
-    border-radius: 3px;
-}
-
-.apps-configured-action {
-    margin-left: 15px;
-    text-transform: uppercase;
-    font-size: 1.2rem;
-    font-weight: 500;
-}
-
-.apps-card-app-icon {
-    flex: 0 0 47px;
-    margin: 0 12px 0 0;
-    width: 47px;
-    height: 47px;
-    background-position: center center;
-    background-size: cover;
-    background-repeat: no-repeat;
-    border-radius: 15%;
-    mix-blend-mode: multiply;
-}
-
-.apps-card-meta {
-    display: flex;
-    flex-direction: column;
-    padding-right: 40px;
-}
-@media (max-width: 500px) {
-    .apps-card-meta {
-        flex-basis: 70%;
-        padding-right: 10px;
-    }
-}
-
-.apps-card-app-disabled .apps-card-meta {
-    opacity: 0.4;
-}
-
-.apps-card-app-disabled .apps-card-app-title-container {
-    display: flex;
-}
-
-.apps-card-app-disabled .apps-card-app-icon {
-    filter:grayscale(1);
-    opacity:0.3;
-}
-
-.apps-card-app-disabled .apps-card-meta svg {
-    margin-left: 4px;
-    width: 14px;
-    opacity: 0.9;
-}
-
-.apps-card-app-disabled .apps-card-meta path {
-    fill: #292d33;
-}
-
-.apps-card-app-disabled .apps-card-app-disabled-cta {
-    color: #30cf43;
-    margin-right: 28px;
-    font-weight: 600;
-}
-
-.apps-card-app-title {
-    margin: 0;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-    font-size: 1.5rem;
-    letter-spacing: 0;
-    line-height: 1.3em;
-    font-weight: 600;
-}
-@media (max-width: 500px) {
-    .apps-card-app-title {
-        white-space: normal;
-        font-size: 1.5rem;
-        letter-spacing: 0;
-    }
-}
-
-
-/* Apps Card Meta
-/* ---------------------------------------------------------- */
-
-.apps-card-app-desc {
-    display: -webkit-box;
-    overflow: hidden;
-    margin: 4px 0 0;
-    padding: 0;
-    max-height: 4.2rem;
-    color: var(--midgrey);
-    text-overflow: ellipsis;
-    font-size: 1.3rem;
-    line-height: 1.3em;
-    font-weight: 400;
-
-    -webkit-line-clamp: 2;
-    -webkit-box-orient: vertical;
-}
-@media (min-width: 600px) and (max-width: 1460px) {
-    .apps-card-app-desc {
-        padding-right: 24px;
-    }
-}
-
-
-/* Apps Card Footer
-/* ---------------------------------------------------------- */
-
-.apps-card-footer {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    margin-top: 15px;
-    width: 100%;
-}
-
-/* Details
-/* ---------------------------------------------------------- */
-
-.app-grid {
-    display: flex;
-    justify-content: flex-start;
-    align-items: flex-start;
-    align-content: flex-start;
-}
-
-.app-icon {
-    position: relative;
-    flex: 1 0 60px;
-    width: 60px;
-    min-width: 60px;
-    height: 60px;
-    background-position: center center;
-    background-size: cover;
-    border-radius: 10%;
-    margin-right: 24px;
-}
-
-.app-icon img {
-    display: block;
-}
-
-.app-cell h3 {
-    margin: -2px 0 0;
-    color: var(--black);
-    font-size: 3.2rem;
-    font-weight: 700;
-}
-
-.app-cell p {
-    margin: 0;
-    margin-bottom: 5px;
-    color: var(--midgrey-l2);
-    font-size: 1.4rem;
-    line-height: 1.4em;
-}
-
-.app-subtitle {
-    max-width: 550px;
-    color: var(--midgrey);
-    font-size: 1.6rem;
-}
-.app-config-form .gh-btn-grey {
-    margin-top: 1.6em;
-    background-color: #e8e8e8;
-    box-shadow: none;
-    font-size: 1.1rem;
-}
-
-.app-config-form > .gh-btn-grey:hover,
-.app-config-form > .gh-btn-grey:focus {
-    border-color: rgb(223, 225, 227);
-}
-
-.app-api-buttons {
-    display: flex;
-    align-items: center;
-    position: absolute;
-    top: -3px;
-    right: -3px;
-}
-
-.app-api-personal-token-buttons {
-    display: flex;
-    align-items: center;
-    position: absolute;
-    right: 5px;
-}
-
-.app-button-regenerate {
-    height: 26px;
-    display: flex;
-    align-items: center;
-    border: 1px solid var(--lightgrey);
-    border-radius: 3px;
-    padding: 5px 8px;
-    margin-right: 8px;
-    background: var(--white);
-}
-
-.app-button-copy {
-    height: 26px;
-    display: flex;
-    align-items: center;
-    background: var(--black);
-    font-size: 1.2rem;
-    padding: 4px 12px;
-    color: var(--white);
-    font-weight: 500;
-    border-radius: 3px;
-}
-
-/* Zapier templates */
-/* ---------------------------------------------------------- */
-.gh-zapier-data-container {
-    margin: 1.8em 0;
-}
-
-.gh-zapier-data-container .gh-zapier-data {
-    display: flex;
-}
-
-@media (max-width: 500px) {
-    .gh-zapier-data-container .gh-zapier-data {
-        flex-direction: column;
-        align-items: flex-start;
-    }
-}
-
-.gh-zapier-data .data-label {
-    width: 128px;
-    height: 28px;
-    padding: 4px 4px 4px 0;
-    color: var(--midgrey-l2);
-    font-size: 1.4rem;
-    line-height: 1.45;
-    font-weight: 400;
-    white-space: nowrap;
-}
-
-.gh-zapier-data .data {
-    width: 100%;
-    padding: 4px;
-    color: var(--darkgrey);
-    font-size: 1.4rem;
-    line-height: 1.45;
-    font-weight: 500;
-    border-radius: 3px;
-    overflow-x: hidden;
-}
-
-.gh-zapier-data .data.highlight-hover:hover {
-    background: var(--whitegrey-l1);
-}
-
-@media (max-width: 500px) {
-    .gh-zapier-data .data {
-        padding: 4px 0;
-    }
-
-    .gh-zapier-data .data.highlight-hover:hover {
-        background: transparent;
-    }
-}
-
-.gh-zapier-data .admin-key,
-.gh-zapier-data .api-url {
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-    word-wrap: break-word;
-    word-break: break-word;
-}
-
-.gh-settings-zapier-templates .apps-grid-cell:hover {
-    background: var(--white);
-}
-
-.zapier-template-link:hover {
-    border-color: #f04600;
-}
-
-.zapier-template-link span {
-    transition: all 0.2s ease;
-    transition-property: color;
-}
-
-.zapier-template-link:hover span {
-    color: #f04600;
-}
-
-.gh-settings-zapier-templates .apps-card-app-title {
-    margin-left: 8px;
-    white-space: unset;
-}
-
-.gh-settings-zapier-templates .apps-card-app {
-    height: 68px;
-}
-
-.gh-settings-zapier-templates .gh-card-right {
-    display: flex;
-    flex-direction: column;
-    justify-content: center;
-}
-
-.zapier-footer,
-.zapier-footer a {
-    display: flex;
-    justify-content: flex-end;
-    align-items: center;
-    color: var(--midgrey);
-    font-size: 1.3rem;
-}
-
-.zapier-footer figure {
-    margin: 0 0 2px;
-    width: 47px;
-    height: 47px;
-    background-position: 50%;
-    background-size: cover;
-    background-repeat: no-repeat;
-    border-radius: 15%;
-}
-
-/* Custom Integrations
-/* ---------------------------------------------------------- */
-.new-webhook-cell td {
-    padding: 0;
-}
-
-.new-webhook-cell:hover {
-    background: var(--whitegrey-l2);
-}
-
-.app-custom-icon-container {
-    margin-right: 32px;
-}
-
-.app-custom-icon {
-    display: flex;
-    position: relative;
-    align-items: center;
-    height: 117px;
-    width: 117px;
-    margin: 0;
-    border-radius: 3px;
-    border: 1px solid var(--whitegrey-d1);
-    background: var(--white);
-    padding: 24px;
-}
-
-.app-custom-icon-uploadlabel {
-    position: absolute;
-    top: 0;
-    left: 0;
-    bottom: 0;
-    right: 0;
-    width: 100%;
-    height: 100%;
-    color: var(--white);
-    border-radius: 3px;
-    text-align: center;
-    background-color: var(--black);
-    font-size: 1.3rem;
-    font-weight: 600;
-}
-
-.app-custom-api-table {
-    margin-bottom: 0;
-}
-
-.app-custom-api-table .data-label {
-    width: 160px;
-}
-
-.app-custom-api-table .data.highlight-hover:hover {
-    background: var(--white) !important;
-}
-
-.apps-card-app-orb {
-    width: 32px;
-    height: 32px;
-}
-
-.apps-card-app-orb.rot-1 {
-    transform: rotate(90deg);
-}
-
-.apps-card-app-orb.rot-2 {
-    transform: rotate(180deg);
-}
-
-.apps-card-app-orb.rot-3 {
-    transform: rotate(270deg);
-}
-
-/* Pintura integration
-/* ---------------------------------------------------------- */
-.gh-pintura-banner.gh-main-section-content {
-    display: grid;
-    grid-template-columns: 4fr 3fr;
-    padding: 0;
-    font-size: 1.5rem;
-}
-
-.gh-pintura-banner-content {
-    padding: 24px;
-}
-
-.gh-pintura-banner-content p {
-    margin-top: 0.8em;
-    margin-bottom: 0;
-}
-
-.gh-pintura-banner-content .gh-btn {
-    margin-top: 1.2em;
-    background-color: var(--black) !important;
-}
-
-.gh-pintura-banner-image {
-    border-radius: 0 3px 3px 0;
-}
diff --git a/ghost/admin/app/styles/layouts/editor.css b/ghost/admin/app/styles/layouts/editor.css
index bb3cd517ad1..70f5b1d0154 100644
--- a/ghost/admin/app/styles/layouts/editor.css
+++ b/ghost/admin/app/styles/layouts/editor.css
@@ -593,6 +593,7 @@ body[data-user-is-dragging] .gh-editor-feature-image-dropzone {
     width: 1em;
     height: 1em;
     margin-left: 24px;
+    margin-bottom: 2px;
     line-height: 1.2;
 }
 
@@ -624,6 +625,7 @@ body[data-user-is-dragging] .gh-editor-feature-image-dropzone {
     width: 100%;
     height: 24px;
     margin: 0 0 1.7em 0;
+    padding: 0;
     outline: none;
     border-width: 0;
     border-style: none;
@@ -1057,14 +1059,6 @@ figure {
     padding-right: 8px; /* extra padding used for dynamic positioning with js */
 }
 
-.gh-announcement-editor {
-    width: 100%;
-}
-
-.gh-announcement-editor div {
-    width: 100%;
-}
-
 /* Labs
 /* ---------------------------------------------------------- */
 
@@ -1110,3 +1104,11 @@ figure {
 .gh-editor-hidden-indicator svg {
     height: 2.4rem;
 }
+
+.gh-setting-error {
+    margin-top: 1em;
+    line-height: 1.3em;
+    color: var(--red);
+    font-weight: 300;
+    letter-spacing: 0.3px;
+}
diff --git a/ghost/admin/app/styles/layouts/labs.css b/ghost/admin/app/styles/layouts/labs.css
deleted file mode 100644
index 051e711ac1d..00000000000
--- a/ghost/admin/app/styles/layouts/labs.css
+++ /dev/null
@@ -1,524 +0,0 @@
-.gh-labs-price-label input::-webkit-outer-spin-button, .gh-labs-price-label input::-webkit-inner-spin-button {
-    /* display: none; <- Crashes Chrome on hover */
-    -webkit-appearance: none;
-    margin: 0;
-}
-
-.gh-labs-price-label input[type=number] {
-    -moz-appearance: textfield;
-    /* Firefox */
-}
-
-.gh-labs-toggle-wrapper {
-    padding-top: 6px;
-    padding-bottom: 6px;
-    border-radius: 5px;
-}
-
-.gh-btn-labs-toggle {
-    border: none !important;
-    display: flex;
-    align-items: center;
-    color: var(--blue) !important;
-    background: transparent !important;
-}
-
-.gh-btn-labs-toggle,
-.gh-btn-labs-toggle:hover {
-    box-shadow: none !important;
-}
-
-.gh-btn-labs-toggle svg {
-    width: 10px;
-    height: 10px;
-    margin-right: 5px;
-}
-
-.gh-btn-labs-toggle svg path {
-    stroke: var(--blue);
-}
-
-.gh-labs-disabled .for-checkbox label,
-.gh-labs-disabled .for-checkbox .input-toggle-component,
-.gh-labs-disabled .for-switch label,
-.gh-labs-disabled .for-switch .input-toggle-component
-.gh-labs-disabled .for-radio label,
-.gh-labs-disabled .for-radio .input-toggle-component {
-    cursor: default;
-}
-
-/* Members settings */
-/* ------------------------------------------------ */
-
-.gh-labs-members-radio {
-    cursor: pointer;
-    margin: 0 8px;
-}
-
-.gh-labs-members-radio.active {
-    background: color-mod(var(--blue) alpha(6%));
-    border-color: var(--blue);
-}
-
-.gh-labs-disabled .gh-setting-content, .gh-labs-disabled .gh-setting-action {
-    opacity: 0.25;
-}
-
-.gh-labs-members-emaildropdown {
-    min-width: 208px;
-    margin-left: 8px;
-}
-
-.gh-labs-members-emaildropdown[disabled] {
-    background: var(--whitegrey-d2);
-    color: var(--darkgrey);
-}
-
-.gh-labs-sso-settings svg {
-    position: relative;
-    bottom: 1px;
-    width: 18px;
-    margin-right: 8px;
-}
-
-/* Import modal
-/* ---------------------------------------------------------- */
-
-.fullscreen-modal-import-content {
-    max-width: unset !important;
-}
-
-.gh-content-import-wrapper {
-    width: 420px;
-}
-
-.gh-content-import-wrapper .gh-btn.disabled,
-.gh-content-import-wrapper .gh-btn.disabled:hover {
-    cursor: auto !important;
-    opacity: 0.6 !important;
-}
-
-.gh-content-import-wrapper .gh-btn.disabled span,
-.gh-content-import-wrapper .gh-btn.disabled span:hover {
-    cursor: auto !important;
-    pointer-events: none;
-}
-
-.gh-content-import-wrapper .gh-token-input .ember-power-select-trigger[aria-disabled=true],
-.gh-content-import-wrapper .gh-token-input .ember-power-select-trigger-multiple-input:disabled {
-    background: var(--whitegrey-l2);
-}
-
-@media (max-width: 600px) {
-    .gh-content-import-wrapper,
-    .gh-content-import-wrapper.wide {
-        width: calc(100vw - 128px);
-    }
-}
-
-.gh-content-import-uploader {
-    width: 100%;
-    min-height: 180px;
-}
-
-.gh-content-import-uploader svg {
-    width: 3.2rem;
-    height: 3.2rem;
-    margin-bottom: 1rem;
-}
-
-.gh-content-import-uploader svg path {
-    stroke: var(--midlightgrey);
-}
-
-.gh-content-import-uploader:hover svg path {
-    stroke: var(--midgrey-l1);
-}
-
-.gh-content-import-uploader .description {
-    color: var(--midgrey);
-    font-size: 1.4rem;
-    font-weight: 500;
-}
-
-.gh-content-import-uploader:hover .description {
-    color: var(--midgrey-d2);
-}
-
-.gh-content-import-file {
-    min-height: 180px;
-}
-
-.gh-content-import-spinner {
-    position: relative;
-    display: flex;
-    min-height: 182px;
-    justify-content: center;
-    align-items: center;
-    margin-bottom: -20px;
-}
-
-.gh-content-import-spinner .gh-loading-content {
-    padding-bottom: 0px;
-}
-
-.gh-content-import-spinner .description {
-    padding-top: 46px;
-}
-
-.gh-content-upload-errorcontainer {
-    border: 1px solid var(--whitegrey);
-    border-radius: 4px;
-    padding: 12px;
-    margin-bottom: 24px;
-    color: var(--middarkgrey);
-}
-
-.gh-content-upload-errorcontainer.warning {
-    border-left: 4px solid var(--yellow);
-}
-
-
-.gh-content-upload-errorcontainer.warning p a {
-    color: color-mod(var(--yellow) l(-12%));
-    text-decoration: underline;
-}
-
-.gh-content-upload-errorcontainer.error {
-    border-left: 4px solid var(--red);
-}
-
-.gh-content-upload-errorcontainer.error p a {
-    color: var(--red);
-    text-decoration: underline;
-}
-
-.gh-content-import-errormessage {
-    font-size: 1.25rem;
-    font-weight: 600;
-    margin: 12px 0 0;
-}
-
-p.gh-content-import-errorcontext {
-    font-size: 1.25rem;
-    line-height: 1.3em;
-    margin: 0;
-    font-weight: 400;
-}
-
-.gh-content-import-mapping .error {
-    color: var(--red);
-}
-
-.gh-content-import-mappingwrapper.error {
-    position: relative;
-}
-
-.gh-content-import-mappingwrapper.error::before {
-    display: block;
-    content: "";
-    position: absolute;
-    top: 0;
-    left: 0;
-    right: 0;
-    bottom: 0;
-    border: 1px solid red;
-    z-index: 9999;
-    pointer-events: none;
-}
-
-.gh-content-import-scrollarea {
-    position: relative;
-    max-height: calc(100vh - 350px - 12vw);
-    overflow-y: scroll;
-    margin: 0 -32px;
-    padding: 0 32px;
-    background:
-        /* Shadow covers */
-        linear-gradient(var(--white) 30%, rgba(255,255,255,0)),
-        linear-gradient(rgba(255,255,255,0), var(--white) 70%) 0 100%,
-
-        /* Shadows */
-        /* radial-gradient(farthest-side at 50% 0, rgba(0,0,0,.12), rgba(0,0,0,0)) -64px 0,
-        radial-gradient(farthest-side at 50% 100%, rgba(0,0,0,.12), rgba(0,0,0,0)) -64px 100%; */
-        linear-gradient(rgba(0,0,0,0.08), rgba(0,0,0,0)),
-        linear-gradient(rgba(0,0,0,0), rgba(0,0,0,0.08)) 0 100%;
-	background-repeat: no-repeat;
-	background-color: var(--white);
-	background-size: 100% 40px, 100% 40px, 100% 14px, 100% 14px;
-
-	/* Opera doesn't support this in the shorthand */
-    background-attachment: local, local, scroll, scroll;
-    margin-top: 4px;
-}
-
-.gh-content-import-errorheading {
-    font-size: 1.4rem;
-    line-height: 1.55em;
-    margin-top: 2px;
-}
-
-p.gh-content-import-errordetailtext {
-    font-size: 1.3rem;
-    line-height: 1.4em;
-    color: var(--midgrey);
-}
-
-.gh-content-import-errordetailtext:first-of-type {
-    border-top: 1px solid var(--lightgrey);
-    padding-top: 8px;
-    margin-top: 8px;
-}
-
-.gh-content-import-errordetailtext:not(:last-of-type) {
-    padding-bottom: 4px;
-    margin-bottom: 6px;
-}
-
-.gh-content-import-table {
-    position: relative;
-    margin-bottom: 1px;
-}
-
-.gh-content-import-table::before {
-    position: absolute;
-    display: block;
-    content: "";
-    top: 0;
-    left: -33px;
-    bottom: 0;
-    height: 100%;
-    width: 32px;
-    background: var(--white);
-}
-
-.gh-content-import-table::after {
-    position: absolute;
-    display: block;
-    content: "";
-    top: 0;
-    right: -32px;
-    bottom: 0;
-    height: 100%;
-    width: 32px;
-    background: var(--white);
-}
-
-.gh-content-import-table th {
-    padding: 3px 8px;
-    background: color-mod(var(--darkgrey) a(5%) s(+50%));
-    border-left: 1px solid var(--content-import-table-border);
-    border-top: 1px solid var(--content-import-table-outline);
-    border-bottom: 1px solid var(--content-import-table-border);
-}
-
-.gh-content-import-table tr th:first-of-type {
-    border-left: 1px solid var(--content-import-table-outline);
-    width: 180px;
-}
-
-.gh-content-import-table tr th:last-of-type {
-    border-right: 1px solid var(--content-import-table-outline);
-}
-
-.gh-content-import-table td.empty-cell {
-    background: color-mod(var(--darkgrey) a(3%) s(+50%));
-}
-
-.gh-content-import-table td {
-    padding: 7px 8px 6px;
-    border-left: 1px solid var(--content-import-table-border);
-    border-bottom: 1px solid var(--content-import-table-border);
-    vertical-align: top;
-}
-
-.gh-content-import-table tr td:first-of-type {
-    border-left: 1px solid var(--content-import-table-outline);
-    width: 180px;
-}
-
-.gh-content-import-table tr td:last-of-type {
-    padding: 0;
-    border-right: 1px solid var(--content-import-table-outline);
-}
-
-.gh-content-import-table tr:last-of-type td {
-    border-bottom: 1px solid var(--content-import-table-outline);
-}
-
-.gh-content-import-table td span,
-.gh-content-import-table th span {
-    user-select: none !important;
-}
-
-.gh-content-import-datanav {
-    box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.01), 0 1px 2px rgba(0, 0, 0, 0.05);
-}
-
-p.gh-content-import-errordetail {
-    font-size: 1.2rem;
-    line-height: 1.4em;
-    margin: 10px 0 0 24px;
-}
-
-p.gh-content-import-errordetail:first-of-type {
-    border-top: 1px solid var(--whitegrey);
-    padding-top: 8px;
-    margin-top: 8px;
-}
-
-.gh-import-content-select {
-    height: auto;
-    border: none;
-    background: none;
-    border-radius: 0;
-}
-
-.gh-import-content-select select {
-    height: 34px;
-    border: none;
-    font-size: 1.3rem;
-    line-height: 1em;
-    padding: 4px 4px 4px 8px;
-    background: none;
-    color: var(--middarkgrey);
-    font-weight: 600;
-    border-radius: 0;
-}
-
-.gh-import-content-select select option {
-    font-weight: 400;
-    color: var(--darkgrey);
-}
-
-.gh-import-content-select select:focus {
-    background: none;
-    color: var(--middarkgrey);
-}
-
-.gh-import-content-select.unmapped select,
-.gh-import-content-select.unmapped select:focus {
-    color: var(--midlightgrey);
-    font-weight: 400;
-}
-
-.gh-import-content-select svg {
-    right: 9px;
-}
-
-.gh-content-import-table th.table-cell-field,
-.gh-content-import-table td.table-cell-field,
-.gh-content-import-table th.table-cell-data,
-.gh-content-import-table td.table-cell-data {
-    max-width: 180px;
-    overflow-wrap: break-word;
-}
-
-.gh-content-import-resultcontainer {
-    margin-bottom: 28px;
-}
-
-.gh-content-import-result-summary {
-    flex-basis: 50%;
-}
-
-.gh-content-import-result-summary h2 {
-    font-size: 3.6rem;
-    font-weight: 600;
-    margin: 0;
-    padding: 0;
-}
-
-.gh-content-import-result-summary p {
-    color: var(--darkgrey);
-    margin: 0;
-    padding: 0;
-    line-height: 1.6em;
-    margin-bottom: 12px;
-}
-
-.gh-content-import-result-summary p strong {
-    font-size: 1.5rem;
-    letter-spacing: 0;
-}
-
-.gh-content-import-errorlist {
-    width: 100%;
-    margin: 8px 0 28px;
-}
-
-.gh-content-import-errorlist h4 {
-    font-size: 13px;
-    font-weight: 500;
-    border-bottom: 1px solid var(--whitegrey);
-    padding-bottom: 8px;
-    margin-top: 0px;
-    color: var(--midgrey);
-}
-
-.gh-content-import-errorlist ul li {
-    font-size: 13px;
-    font-weight: 400;
-    color: var(--midlightgrey-d2);
-    padding: 0;
-    margin-bottom: 6px;
-}
-
-.gh-content-import-resultcontainer hr {
-    margin: 24px -32px;
-    border-color: var(--whitegrey);
-}
-
-.gh-content-import-nodata span {
-    display: flex;
-    min-height: 144px;
-    align-items: center;
-    justify-content: center;
-    color: var(--midgrey);
-}
-
-.gh-content-import-icon-content path,
-.gh-content-import-icon-content circle {
-    stroke-width: 0.85px;
-}
-
-.gh-content-import-icon-confetti {
-    color: var(--pink);
-    margin-left: 12px;
-}
-
-.gh-content-import-icon-confetti path,
-.gh-content-import-icon-confetti circle,
-.gh-content-import-icon-confetti ellipse {
-    stroke-width: 0.85px;
-}
-
-.gh-import-content-icon {
-    color: var(--darkgrey);
-    width: 54px !important;
-    height: 54px !important;
-    margin-right: -8px;
-}
-
-.gh-import-content-icon * {
-    stroke-width: 0.8px !important;
-}
-
-/* Fixing Firefox's select padding */
-@-moz-document url-prefix() {
-    .gh-import-content-select select {
-        padding: 4px;
-    }
-}
-
-.fullscreen-modal-import-content {
-    max-width: unset !important;
-}
-
-.gh-import-content-spinner {
-    min-height: 120px;
-}
-
-.gh-import-content-spinner .gh-loading-content {
-    padding-bottom: 0;
-}
diff --git a/ghost/admin/app/styles/layouts/main.css b/ghost/admin/app/styles/layouts/main.css
index 9c210c85226..0625a1c00a4 100644
--- a/ghost/admin/app/styles/layouts/main.css
+++ b/ghost/admin/app/styles/layouts/main.css
@@ -5,7 +5,6 @@
     --mainmenu-color-active-bg: var(--whitegrey);
     --mainmenu-width: 320px;
     --mainmenu-padding: var(--main-layout-area-padding);
-    --contextualmenu-width: 360px;
 }
 
 /* Utils */
@@ -216,9 +215,7 @@
 }
 
 .gh-nav-main-enter-active,
-.gh-nav-main-leave-active,
-.gh-nav-contextual-enter-active,
-.gh-nav-contextual-leave-active {
+.gh-nav-main-leave-active {
     position: absolute;
     top: 0;
     height: 100%;
@@ -235,29 +232,6 @@
     transform: translateX(-100%);
 }
 
-.gh-nav-contextual-enter-active,
-.gh-nav-contextual-leave-active {
-    width: calc(var(--contextualmenu-width) - 1px);
-}
-
-/* For some reason the animate-in transition wasn't working with pure transforms */
-/* Using `left` correctly positioned the starting state so we could then use opposite transforms */
-.gh-nav-contextual-enter-active {
-    left: calc(var(--contextualmenu-width) - 1px);
-}
-
-.gh-nav-contextual-enter-to {
-    transform: translateX(-100%);
-}
-
-.gh-nav-contextual-leave {
-    transform: translateX(0);
-}
-
-.gh-nav-contextual-leave-to {
-    transform: translateX(calc(var(--mainmenu-width) - 1px));
-}
-
 .gh-account-menu-header {
     position: relative;
     display: flex;
@@ -2044,14 +2018,6 @@ section.gh-ds h2 {
     line-height: 1.45em;
 }
 
-.gh-done .gh-setting-desc {
-    padding-right: 2rem;
-}
-
-.gh-done .gh-nav-design .gh-setting-action {
-    margin-bottom: 12px;
-}
-
 .gh-done-panel {
     margin: 8px 0 24px;
     padding: 52px var(--main-layout-area-padding) 16px;
@@ -2280,4 +2246,4 @@ section.gh-ds h2 {
     border: 1px solid var(--green);
     border-radius: 4px;
     margin-top: 8px;
-}
\ No newline at end of file
+}
diff --git a/ghost/admin/app/styles/layouts/members.css b/ghost/admin/app/styles/layouts/members.css
index 7baa45e351e..2c72e91165b 100644
--- a/ghost/admin/app/styles/layouts/members.css
+++ b/ghost/admin/app/styles/layouts/members.css
@@ -1862,24 +1862,10 @@ p.gh-members-import-errordetail:first-of-type {
     width: 100%;
 }
 
-.gh-email-design-typography .gh-setting-dropdown {
-    margin: 0;
-    padding: 0 8px 0 8px;
-}
-
-.gh-email-design-typography-wrapper.header .gh-setting-dropdown {
-    border-top-right-radius: 0;
-    border-bottom-right-radius: 0;
-}
-
 .gh-email-design-typography-wrapper.header .ember-power-select-status-icon {
     right: 16px !important;
 }
 
-.gh-email-design-typography .gh-setting-dropdown-list .ember-power-select-option {
-    padding: 2px 8px;
-}
-
 .gh-email-design-typography-wrapper.header .gh-btn-group {
     background: var(--whitegrey);
     border-top-left-radius: 0;
diff --git a/ghost/admin/app/styles/layouts/offers.css b/ghost/admin/app/styles/layouts/offers.css
index 336504c2051..4371aebd3da 100644
--- a/ghost/admin/app/styles/layouts/offers.css
+++ b/ghost/admin/app/styles/layouts/offers.css
@@ -296,6 +296,38 @@
     box-shadow: var(--box-shadow-preview-box);
 }
 
+.gh-setting-members-portal-mock {
+    display: flex;
+    position: relative;
+    align-items: center;
+    justify-content: center;
+    background: #fff;
+    box-shadow: var(--box-shadow-preview-box);
+    width: 420px;
+    height: 562px;
+    margin-bottom: 32px;
+    border-radius: 5px;
+    pointer-events: none;
+    transition: height 0.17s ease-out;
+}
+
+.gh-setting-members-portal-mock.mock-enabled {
+    pointer-events: unset;
+}
+
+.gh-setting-members-portalpreview {
+    justify-self: end;
+    font-size: 1.3rem;
+    font-weight: 500;
+    color: var(--midgrey);
+}
+
+@media (max-width: 1140px) {
+    .gh-setting-members-portalpreview {
+        display: none;
+    }
+}
+
 .gh-offers-help {
     margin-top: 5vmin;
     margin-bottom: 0;
diff --git a/ghost/admin/app/styles/layouts/packages.css b/ghost/admin/app/styles/layouts/packages.css
deleted file mode 100644
index 08d895a483d..00000000000
--- a/ghost/admin/app/styles/layouts/packages.css
+++ /dev/null
@@ -1,374 +0,0 @@
-/* Packages - Themes / Integrations
-/* ---------------------------------------------------------- */
-
-.package-filter {
-    border-radius: 5px;
-}
-@media (max-width: 1460px) {
-    .package-filter {
-        max-width: 700px;
-    }
-}
-
-
-/* Main Layout
-/* ---------------------------------------------------------- */
-
-.package-grid {
-    display: flex;
-    flex-flow: row wrap;
-    align-items: space-between;
-    margin: -10px -10px 4vw -10px;
-    max-width: 1200px;
-}
-
-/* 3 col themes */
-.package-grid-themes .package-grid-cell {
-    flex: 0 0 33.3333%;
-}
-
-/* 2 col themes */
-@media (max-width: 1240px) {
-    .package-grid-themes .package-grid-cell {
-        flex: 0 0 100%;
-    }
-}
-
-/* 1 col themes */
-@media (max-width: 800px) {
-    .package-grid-themes .package-grid-cell {
-        flex: 1 1 100%;
-    }
-}
-
-/* 2 col apps */
-.package-grid-apps .package-grid-cell {
-    flex: 0 0 100%;
-}
-
-/* 1 col apps */
-@media (max-width: 1200px) {
-    .package-grid-apps .package-grid-cell {
-        flex: 1 1 100%;
-    }
-}
-
-
-/* Package Card Theme
-/* ---------------------------------------------------------- */
-
-.package-card-theme {
-    overflow: hidden;
-    margin: 10px;
-    border: rgba(0,0,0,0.1) 1px solid;
-    border-radius: 5px;
-}
-
-.package-index .package-card-theme,
-.package-featured .package-card-theme {
-    flex: 1 1 240px;
-}
-
-.package-card-theme-image {
-    position: relative;
-    display: block;
-}
-
-.package-card-theme-image:hover img {
-    filter: grayscale(0.5) blur(1px);
-
-    -webkit-filter: grayscale(0.5) blur(1px);
-}
-
-.package-card-theme-image:hover .package-card-theme-overlay {
-    opacity: 1;
-    transition: all 0.2s ease;
-}
-
-.package-card-theme-image img {
-    display: block;
-    max-width: 100%;
-    line-height: 0;
-}
-
-.package-card-theme-overlay {
-    position: absolute;
-    top: 0;
-    right: 0;
-    bottom: 0;
-    left: 0;
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    padding: 10%;
-    background: rgba(0,20,40,0.2);
-    text-align: center;
-    opacity: 0;
-    transition: opacity 0.4s ease;
-}
-
-.package-card-theme-title {
-    color: #fff;
-    font-size: 2rem;
-    line-height: 1.15em;
-    font-weight: 300;
-}
-
-.package-card-theme .package-card-footer {
-    margin: 0;
-    padding: 16px 20px;
-    border-top: rgba(0,0,0,0.1) 1px solid;
-}
-
-/* Package Card App
-/* ---------------------------------------------------------- */
-
-.package-card-app {
-    overflow: hidden;
-    margin: 10px;
-    padding: 14px;
-    height: 75px;
-    /*max-width: 700px;*/
-    border: rgba(0,0,0,0.1) 1px solid;
-    border-radius: 5px;
-    transition: background 0.3s ease;
-}
-
-.package-card-app:hover {
-    background: rgba(0,20,60,0.03);
-    cursor: pointer;
-    transition: background 0.1s ease;
-}
-
-.package-card-content {
-    position: relative;
-    display: flex;
-}
-
-.package-card-content .gh-btn {
-    position: absolute;
-    right: 20px;
-}
-
-.package-card-app-icon {
-    flex: 0 0 47px;
-    margin: 0 15px 0 0;
-    width: 47px;
-    height: 47px;
-    background-position: center center;
-    background-size: cover;
-    border-radius: 15%;
-}
-
-.package-card-meta {
-    position: relative;
-    display: flex;
-    flex-direction: column;
-}
-
-.package-card-app-title {
-    overflow: hidden;
-    margin: 0 0 4px 0;
-    padding: 0 70px 0 0;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-    font-size: 1.7rem;
-    font-weight: normal;
-}
-
-
-/* Package Card Meta
-/* ---------------------------------------------------------- */
-
-.package-card-stats {
-    position: absolute;
-    top: -5px;
-    right: 0;
-    display: flex;
-    align-items: center;
-}
-
-.package-downloads {
-    display: flex;
-    align-items: center;
-    height: 26px;
-    border: transparent 1px solid;
-    color: var(--midgrey);
-    font-size: 13px;
-    line-height: 24px;
-}
-
-.package-downloads:hover {
-    cursor: default;
-}
-
-.package-downloads svg {
-    margin-right: 5px;
-    height: 15px;
-}
-
-.package-download-count {
-    font-size: 13px;
-}
-
-.package-card-app-desc {
-    display: -webkit-box;
-    overflow: hidden;
-    margin: 0;
-    padding: 0;
-    max-height: 4.2rem;
-    color: var(--midgrey);
-    text-overflow: ellipsis;
-    font-size: 1.4rem;
-    line-height: 1.3em;
-    font-weight: 300;
-
-    -webkit-line-clamp: 2;
-    -webkit-box-orient: vertical;
-}
-@media (min-width: 600px) and (max-width: 1460px) {
-    .package-card-app-desc {
-        padding-right: 80px;
-    }
-}
-
-
-/* Package Card Footer
-/* ---------------------------------------------------------- */
-
-.package-card-footer {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    margin-top: 15px;
-    width: 100%;
-}
-
-.package-developer {
-    display: flex;
-    align-items: center;
-    color: var(--midgrey);
-}
-
-.package-developer:hover {
-    color: var(--blue);
-}
-
-.package-developer img {
-    flex-shrink: 0;
-    margin-right: 6px;
-    width: 20px;
-    height: 20px;
-    border-radius: 100%;
-}
-
-.package-developer-name {
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-    font-size: 1.4rem;
-}
-
-.package-controls {
-    flex-shrink: 0;
-    display: flex;
-    overflow: hidden;
-    border: rgba(0,0,0,0.1) 1px solid;
-    border-radius: 4px;
-}
-
-.package-controls-button {
-    display: flex;
-    align-items: center;
-    padding: 7px 12px;
-    border-left: rgba(0,0,0,0.1) 1px solid;
-    background: #fff;
-    color: var(--midgrey);
-    font-size: 1.3rem;
-    line-height: 1;
-    transition: none;
-}
-
-.package-controls-button:first-child {
-    border: none;
-}
-
-.package-controls-button:hover {
-    color: var(--darkgrey);
-}
-
-.package-controls-button svg {
-    margin-right: 5px;
-    width: 11px;
-    height: 11px;
-}
-
-.package-disable {
-    border-right: var(--green) 3px solid;
-}
-
-.package-enable {
-    border-right: var(--red) 3px solid;
-}
-
-
-/* Media Queries
-/* ---------------------------------------------------------- */
-
-@media (max-width: 800px) {
-    .package-grid-apps {
-        overflow: hidden;
-        margin: 0 0 4vw 0;
-        border: #dfe1e3 1px solid;
-        border-radius: 5px;
-    }
-
-    .package-card-app {
-        margin: 0;
-        border: none;
-        border-top: #dfe1e3 1px solid;
-        border-radius: 0;
-    }
-    .package-grid-cell:first-of-type .package-card-app {
-        border-top: none;
-    }
-}
-
-@media (max-width: 760px) {
-    .package-card-app {
-        padding: 15px;
-    }
-    .package-card-app .package-developer {
-        display: none;
-    }
-    .package-card-app .package-card-footer {
-        justify-content: flex-end;
-    }
-    .package-card-theme .package-card-footer {
-        margin: 0;
-        padding: 15px;
-    }
-}
-
-@media (max-width: 600px) {
-    .package-grid {
-        margin: -10px -10px 4vw -10px;
-        border: none;
-    }
-    .package-grid-apps {
-        margin: -10px -20px 4vw -20px;
-    }
-}
-
-@media (max-width: 540px) {
-    .package-card-footer {
-        justify-content: flex-end;
-    }
-    .package-card-app .package-card-footer {
-        flex-direction: column;
-        align-items: flex-start;
-    }
-    .package-card-footer .package-developer {
-        display: none;
-    }
-}
diff --git a/ghost/admin/app/styles/layouts/portal-settings.css b/ghost/admin/app/styles/layouts/portal-settings.css
deleted file mode 100644
index cccabbc32d6..00000000000
--- a/ghost/admin/app/styles/layouts/portal-settings.css
+++ /dev/null
@@ -1,688 +0,0 @@
-.fullscreen-modal-portal-settings {
-    margin: 30px;
-    max-width: 100%;
-}
-
-.fullscreen-modal-portal-settings .modal-content {
-    position: relative;
-    overflow: auto;
-    height: 100%;
-    padding: 0;
-}
-
-.fullscreen-modal-portal-settings .modal-body {
-    margin: 0;
-}
-
-.gh-ps-header {
-    position: sticky;
-    top: 0;
-    left: 0;
-    right: 0;
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    margin: 0;
-    padding: 18px 32px;
-    border-top-left-radius: 6px;
-    border-top-right-radius: 6px;
-    overflow: hidden;
-    background-position: center;
-    background-repeat: no-repeat;
-    background-size: cover;
-    background: var(--white);
-    z-index: 9999;
-}
-
-.gh-ps-header h2 {
-    width: calc(50vw - 200px);
-    margin: 0;
-}
-
-.gh-ps-header-border {
-    border-bottom: 1px solid var(--whitegrey);
-}
-
-.gh-ps-close {
-    width: calc(50vw - 200px);
-}
-
-.gh-ps-modal-body {
-    height: 100%;
-    display: flex;
-    flex-direction: column;
-}
-
-.gh-show-modal-link-form .gh-input {
-    white-space: nowrap;
-    overflow: hidden;
-    text-overflow: ellipsis;
-}
-
-.gh-portal-settings-sidebar {
-    padding: 0;
-    width: 400px;
-    height: calc(100vh - 60px);
-    overflow-x: hidden;
-}
-
-.gh-portal-settings-sidebar .modal-fullsettings-body-labs {
-    overflow: unset;
-}
-
-.gh-portal-form-wrapper {
-    overflow: hidden;
-    width: 400px;
-}
-
-.gh-portal-settings-form {
-    min-width: 292px;
-    margin: 0 -80px 0 0 !important;
-    padding: 4px 100px 0 20px;
-    max-height: calc(100vh - 60px - 66px);
-    overflow-y: scroll;
-    overflow-x: hidden;
-}
-
-.gh-portal-settings .form-group.space-l {
-    margin-bottom: 1.6em;
-}
-
-.gh-portal-setting-title {
-    font-size: 1.3rem;
-    font-weight: 600;
-    margin: 0;
-}
-
-.gh-portal-settings .for-switch.small {
-    width: 36px !important;
-    height: 22px !important;
-}
-
-.gh-portal-settings .gh-members-emailsettings-footer-input {
-    height: 78px;
-}
-
-.gh-portal-settings .gh-members-emailsettings-footer-input p {
-    height: 60px;
-}
-
-.gh-portal-setting-sectionheading {
-    font-size: 1.1rem;
-    font-weight: 600;
-    text-transform: uppercase;
-    letter-spacing: 0.2px;
-    color: var(--midgrey-l1);
-    margin: 0;
-    padding: 0 0 8px;
-    border-bottom: 1px solid var(--whitegrey);
-}
-
-.gh-portal-setting-sectionheading.gh-stripe-connect {
-    display: flex;
-    justify-content: space-between;
-}
-
-.gh-portal-setting-sectionheading.gh-stripe-connect .gh-btn-link {
-    color: #6772E5;
-    text-transform: initial;
-    font-size: 1.25rem;
-    font-weight: 400;
-    cursor: pointer;
-}
-
-.gh-portal-setting-section {
-    margin: 0 -24px 2.4em;
-    padding: 0 28px;
-}
-
-.gh-portal-setting-section p {
-    line-height: 1.5em;
-}
-
-.gh-portal-settings .input-color input {
-    position: relative;
-    height: 30px;
-    width: 102px;
-    padding: 3px 4px 3px 44px;
-    font-size: 1.3rem;
-}
-
-.gh-portal-settings .input-color::after {
-    top: 5px;
-    left: 34px;
-}
-
-.gh-portal-settings .color-picker-horizontal-divider {
-    position: absolute;
-    display: block;
-    content: "";
-    width: 1px;
-    top: 0;
-    left: 29px;
-    bottom: 0;
-    background: var(--input-border-color);
-}
-
-.gh-portal-settings .input-color input:focus + .color-picker-horizontal-divider {
-    top: 2px;
-    bottom: 2px;
-}
-
-.gh-portal-settings .color-box-container {
-    height: 26px;
-    width: 26px;
-    position: absolute;
-    overflow: hidden;
-    top: 2px;
-    left: 2px;
-    border-top-left-radius: 2px;
-    border-bottom-left-radius: 2px;
-}
-
-.gh-portal-settings .color-box-container .color-picker {
-    position: absolute;
-    top: -10px;
-    left: -10px;
-    border: none;
-    outline: none;
-    padding: 0;
-    margin: 0;
-    width: 50px;
-    height: 50px;
-}
-
-.gh-portal-settings .gh-select svg {
-    top: 19px;
-    right: 9px;
-}
-
-.gh-portal-settings-topbarheight {
-    height: 66px;
-}
-
-.gh-portal-settings-main {
-    display: flex;
-    flex-direction: column;
-    flex-grow: 1;
-    padding: 0;
-    border-left: 1px solid var(--whitegrey);
-    background: linear-gradient(45deg, rgba(255,255,255,1) 0%, rgba(249,249,250,1) 100%);
-}
-
-.gh-portal-settings .modal-footer {
-    margin-top: 28px;
-}
-
-.gh-portal-settings-maintabs {
-    list-style: none;
-    list-style-type: none;
-    display: flex;
-    align-items: center;
-    padding: 0;
-    margin: 0;
-    border: 1px solid color-mod(var(--midgrey) l(+35%) s(+10%));
-    border-radius: 5px;
-    letter-spacing: 0.2px;
-    box-shadow: 0 2px 5px -3px rgba(0,0,0,.12);
-}
-
-.gh-portal-settings-maintabs li {
-    padding: 0;
-    margin: 0;
-}
-
-.gh-portal-settings-maintabs li:not(:last-of-type) {
-    border-right: 1px solid color-mod(var(--midgrey) l(+35%) s(+10%));
-}
-
-.gh-portal-settings-maintabs li a {
-    position: relative;
-    display: inline-block;
-    padding: 3px 10px 4px;
-    margin: 4px;
-    color: color-mod(var(--midgrey) l(-7%));
-    background: var(--white);
-    min-width: 56px;
-    text-align: center;
-    border-radius: 2px;
-    outline: none;
-    box-sizing: content-box;
-    font-size: 1.3rem;
-}
-
-.gh-portal-settings-maintabs li.active a {
-    color: var(--blue);
-    font-weight: 500;
-}
-
-.gh-portal-settings-icons {
-    display: flex;
-    flex-grow: 1;
-    align-items: center;
-    justify-content: flex-start;
-    padding: 2px;
-    gap: 12px;
-}
-
-.gh-portal-setting-first {
-    margin: 12px 0 0;
-}
-
-.gh-portal-setting-last {
-    margin-bottom: 12px !important;
-}
-
-.gh-portal-button-icon {
-    display: inline-block;
-    cursor: pointer;
-    width: 38px;
-    height: 40px;
-    padding: 10px;
-    background-repeat: no-repeat;
-    background-size: 22px 22px;
-    background-position: center;
-    border-radius: 2px;
-    margin: 3px;
-}
-
-.gh-portal-button-icon:hover {
-    box-shadow: 0px 0px 0px 1px color-mod(var(--green) a(40%));
-}
-
-.gh-portal-button-icon:hover svg path {
-    stroke: var(--green);
-}
-
-.gh-portal-button-icon.selected-icon {
-    box-shadow: 0px 0px 0px 2px var(--green);
-}
-
-.gh-portal-button-icon svg path {
-    stroke: var(--midlightgrey-d1);
-}
-
-.gh-portal-button-icon.selected-icon svg path {
-    stroke: var(--green);
-}
-
-.gh-portal-button-icon .gh-loading-spinner {
-    width: 20px;
-    height: 20px;
-}
-
-.gh-portal-button-icon .gh-loading-spinner:before {
-    margin-top: -2px;
-}
-
-.gh-portal-button-uploadicon,
-.gh-portal-button-uploadicon:hover,
-.gh-portal-button-uploadicon:focus {
-    height: 44px;
-    width: 44px;
-    border: none;
-    box-shadow: none;
-    background: transparent;
-    border: 1px dashed var(--lightgrey);
-}
-
-.gh-portal-button-uploadicon span {
-    display: flex;
-    align-items: center;
-    justify-content: center;
-}
-
-.gh-portal-button-uploadicon span svg {
-    width: 18px;
-    height: 18px;
-    fill: var(--darkgrey);
-}
-
-.gh-portal-button-uploadicon:hover span svg {
-    fill: var(--darkgrey);
-}
-
-.gh-portal-button-deleteicon,
-.gh-portal-button-deleteicon:hover,
-.gh-portal-button-deleteicon:focus {
-    height: 44px;
-    width: 44px;
-    border: none;
-    color: var(--white);
-    box-shadow: none;
-}
-
-.gh-portal-button-deleteicon span {
-    display: flex;
-    align-items: center;
-    justify-content: center;
-}
-
-.gh-portal-button-deleteicon span svg {
-    width: 18px;
-    height: 18px;
-}
-
-.gh-portal-setting-copy {
-    position: absolute;
-    display: flex;
-    align-items: center;
-    top: 2px;
-    right: 2px;
-    height: 32px;
-    padding: 0 8px 0 9px;
-    border-radius: 2px;
-    background: var(--whitegrey-l2);
-    border-color: transparent;
-    box-shadow: none;
-    font-size: 1.3rem;
-}
-
-.gh-portal-setting-copy span {
-    margin-top: -2px;
-}
-
-.gh-portal-siteiframe {
-    pointer-events: none;
-    transform: scale(0.95) !important;
-    transform-origin: 0 0;
-    width: calc((1 / 0.95) * 100%) !important;
-    height: calc((1 / 0.95) * 100%) !important;
-}
-
-.gh-portal-siteiframe-enabled {
-    pointer-events: unset;
-}
-
-.gh-portal-site-frame-cover {
-    position: absolute;
-    top: 0;
-    right: 0;
-    bottom: 0;
-    left: 0;
-    background: #edf0f2;
-    overflow: hidden;
-    border: none;
-}
-
-.gh-portal-settings-title {
-    padding-bottom: 28px;
-    position: sticky;
-    background: var(--main-bg-color);
-    z-index: 9999;
-    width: 100%;
-    top: 0;
-}
-
-.gh-portal-settings-previewheader {
-    display: flex;
-    align-items: center;
-    justify-content: flex-end;
-    position: relative;
-    height: 84px;
-    padding: 0 24px;
-    margin: 0;
-    width: 100%;
-}
-
-.gh-portal-settings-previewheader .gh-btn-group .gh-btn {
-    min-width: 90px;
-}
-
-.gh-portal-settings-actions {
-    display: flex;
-    align-items: center;
-    margin-left: 24px;
-}
-
-.gh-portal-preview-wrapper {
-    overflow: hidden;
-    max-height: calc(100vh - 60px - 84px);
-    height: 100%;
-    background: linear-gradient(45deg, rgba(255,255,255,1) 0%, rgba(249,249,250,1) 100%);
-}
-
-.gh-portal-preview-container {
-    position: relative;
-    flex-grow: 1;
-    overflow: hidden;
-    background: linear-gradient(45deg, rgba(255,255,255,1) 0%, rgba(249,249,250,1) 100%);
-    max-height: calc(100vh - 60px - 84px);
-}
-
-.gh-portal-preview-wrapper .gh-portal-preview-container {
-    overflow-x: hidden;
-    overflow-y: scroll;
-    margin: 0 -70px;
-    padding: 0 70px;
-    border: none;
-    border-radius: 0;
-    height: 100%;
-}
-
-.gh-portal-preview-container.hide {
-    display: none
-}
-
-.gh-portal-links-container {
-    position: relative;
-    display: flex;
-    box-sizing: border-box;
-    flex-direction: column;
-    justify-content: flex-start;
-    overflow: hidden;
-    font-size: 1.5rem;
-    letter-spacing: 0;
-    text-align: left;
-    letter-spacing: 0;
-    text-rendering: optimizeLegibility;
-    background: var(--white);
-    width: 720px;
-    padding: 32px;
-    margin: 95px auto 32px;
-    border-radius: 5px;
-    box-shadow: 0 0 0 1px rgba(0,0,0,0.02), 0 2.8px 2.2px rgba(0, 0, 0, 0.02), 0 6.7px 5.3px rgba(0, 0, 0, 0.028), 0 12.5px 10px rgba(0, 0, 0, 0.035), 0 22.3px 17.9px rgba(0, 0, 0, 0.042), 0 41.8px 33.4px rgba(0, 0, 0, 0.05), 0 100px 80px rgba(0, 0, 0, 0.07);
-}
-
-.gh-portal-links-main h2 {
-    font-weight: 600;
-    font-size: 1.9rem;
-}
-
-.gh-portal-links-main p {
-    margin-bottom: 10px;
-}
-
-.gh-portal-links-table {
-    width: 100%;
-    padding: 0;
-    margin: 20px 0 0;
-}
-
-.gh-portal-links-table tr td {
-    white-space: nowrap;
-    padding: 10px 12px 0 0;
-}
-
-.gh-portal-links-table tr.header h4 {
-    font-size: 1.2rem;
-    text-transform: uppercase;
-    color: var(--midlightgrey-d2);
-    font-weight: 500;
-    margin-bottom: 8px;
-}
-
-.gh-portal-links-table tr.header .gh-portal-links-cell {
-    font-size: 1.3rem;
-    font-weight: 500;
-    cursor: pointer;
-    text-transform: none;
-    color: var(--green);
-}
-
-.gh-portal-links-table tr td:last-of-type {
-    padding-right: 0;
-}
-
-.gh-portal-links-table tr.header .toggle-header {
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-}
-
-.gh-portal-links-table tr td.pagename {
-    font-size: 1.4rem;
-    width: 130px;
-}
-
-.gh-portal-links-table tr td.pagename.strong {
-    font-weight: 600;
-}
-
-.gh-portal-page-url-container {
-    position: relative;
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    font-size: 1.4rem;
-    padding: 5px 4px 5px 8px;
-    height: 38px;
-    background: var(--whitegrey-l2);
-    border-radius: 4px;
-    border: 1px solid var(--whitegrey);
-    color: var(--darkgrey);
-    font-weight: 500;
-    width: 100%;
-}
-
-.gh-portal-page-url-container .page-url-field {
-    font-size: 1.4rem;
-    border: none;
-    padding-left: 0;
-    padding-right: 40px;
-    color: var(--middarkgrey) !important;
-    background: none;
-    cursor: text;
-}
-
-.gh-portal-page-url-container .page-url-slash {
-    color: var(--midlightgrey);
-    font-weight: 400;
-}
-
-.gh-portal-page-url-container .page-url-label {
-    max-width: 470px;
-    overflow: hidden;
-    white-space: nowrap;
-}
-
-.gh-portal-page-url-container .page-url-label .page-url-label-inner {
-    overflow-y: hidden;
-    overflow-x: scroll;
-    margin: 0 0 -80px 0!important;
-    padding: 0 0 80px 0;
-}
-
-.gh-show-modal-link-form .page-url-label {
-    max-width: 230px;
-}
-
-.gh-portal-page-url-container .page-url-disabled {
-    color: var(--midgrey);
-    font-weight: 400;
-}
-
-.gh-portal-links-group-divider {
-    margin: 8px -32px;
-    border-top-color: var(--whitegrey);
-}
-
-.gh-portal-links-group-divider.first {
-    margin-top: -4px;
-}
-
-.gh-portal-custom-icon {
-    display: flex;
-    justify-content: center;
-    width: 50px;
-}
-
-.gh-portal-button-custom.selected-icon:hover {
-    box-shadow: 0px 0px 0px 1px color-mod(var(--blue) a(40%));
-}
-
-.gh-portal-custom-icon:hover .gh-portal-button-custom.selected-icon {
-    display: none;
-}
-
-.gh-portal-custom-icon:hover .gh-portal-button-deleteicon {
-    display: inline-block;
-}
-
-.gh-portal-custom-icon .gh-portal-button-deleteicon {
-    display: none;
-    background: color-mod(var(--darkgrey) a(0.8));
-}
-
-.gh-portal-setting-no-stripe {
-    padding: 20px;
-    font-size: 1.3rem;
-    text-align: center;
-    background: var(--whitegrey-l2);
-    border: 1px solid var(--whitegrey);
-    border-radius: 4px;
-    color: var(--midgrey);
-}
-
-.gh-portal-setting-section.redirects p {
-    margin-top: 4px;
-}
-
-.gh-portal-emailupdate-button {
-    width: 100%;
-    margin-top: 8px;
-}
-
-.gh-portal-emailupdate-button[disabled],
-.gh-portal-emailupdate-button[disabled]:hover {
-    background: var(--whitegrey-d2) !important;
-    color: var(--darkgrey) !important;
-    cursor: auto;
-}
-
-.gh-portal-settings-sidebar .modal-fullsettings-tab-expanded {
-    padding-top: 16px;
-}
-
-.gh-portal-settings-previewheader .gh-preview-page-selector,
-.gh-portal-settings-previewheader .gh-preview-page-selector select {
-    width: 160px;
-}
-
-.gh-portal-settings-previewheader .gh-preview-page-selector svg {
-    top: 16px;
-}
-
-.gh-portal-settings-stripefooter {
-    padding: 24px;
-    margin: 32px;
-    border: 1px solid var(--whitegrey);
-    border-radius: 4px;
-}
-
-.gh-portal-settings-stripefooter h4 {
-    font-weight: 600;
-    font-size: 1.5rem;
-    margin-bottom: 12px;
-}
-
-.gh-portal-settings-stripefooter p {
-    font-size: 1.35rem;
-    margin-bottom: 10px;
-    color: var(--darkgrey);
-}
-
-.gh-portal-settings-stripefooter .stripe-connect {
-    margin-top: 20px;
-    width: 100%;
-}
diff --git a/ghost/admin/app/styles/layouts/post-history.css b/ghost/admin/app/styles/layouts/post-history.css
index 807bd1065f0..b9a3c1f219d 100644
--- a/ghost/admin/app/styles/layouts/post-history.css
+++ b/ghost/admin/app/styles/layouts/post-history.css
@@ -29,6 +29,27 @@
     background: var(--whitegrey-l2);
 }
 
+.user-list-item-figure {
+    position: relative;
+    display: block;
+    width: 36px;
+    height: 36px;
+    margin-right: 12px;
+    margin-left: 3px;
+    background-position: center center;
+    background-size: cover;
+    border-radius: 100%;
+}
+
+.user-list-item-figure img {
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+    opacity: 0;
+}
+
 .gh-post-history .user-list-item-figure {
     width: 2.8rem;
     height: 2.8rem;
diff --git a/ghost/admin/app/styles/layouts/posts.css b/ghost/admin/app/styles/layouts/posts.css
index ba6259d1ab9..1496804eeff 100644
--- a/ghost/admin/app/styles/layouts/posts.css
+++ b/ghost/admin/app/styles/layouts/posts.css
@@ -8,3 +8,342 @@
     animation-duration: .001s;
     pointer-events: none;
 }
+
+/* Debug screen
+/* ---------------------------------------------------------- */
+.gh-email-debug .gh-post-analytics-header .gh-canvas-header-content {
+    border-bottom: none;
+    padding-bottom: 0;
+}
+
+.gh-email-debug-error {
+    display: flex;
+    margin-top: 20px;
+    padding: 12px 16px 12px 40px;
+}
+
+.gh-email-debug-error svg {
+    height: 20px !important;
+    margin-top: -2px;
+}
+
+.gh-email-debug-errortext {
+    flex-grow: 1;
+    margin-left: 4px;
+}
+
+.gh-email-debug-error h4 {
+    font-size: 1.5rem;
+    font-weight: 600;
+    margin: 0;
+    padding: 0;
+}
+
+.gh-email-debug-error button {
+    min-width: 80px;
+}
+
+.gh-email-debug-settingstab-icon {
+    width: 20px;
+    height: 20px;
+    margin-bottom: 11px;
+    margin-top: 2px;
+}
+
+.gh-email-debug-settingstab-icon svg path,
+.gh-email-debug-settingstab-icon svg circle {
+    stroke-width: 2;
+}
+
+.gh-email-debug .gh-list {
+    border-bottom: none;
+}
+
+.gh-email-debug .gh-list thead,
+.gh-email-debug .gh-list tbody {
+    width: 100%;
+}
+
+.gh-email-debug .gh-list tr:first-of-type .gh-list-data {
+    border-top: none;
+}
+
+.gh-email-debug .gh-list tr .gh-list-data:first-of-type {
+    padding-left: 0;
+}
+
+.gh-email-debug-col-member {
+    padding-left: 0;
+    width: 25%;
+}
+
+.gh-email-debug-member {
+    display: flex;
+    flex-wrap: nowrap;
+    align-items: center;
+}
+
+.gh-email-debug-failure {
+    display: flex;
+}
+
+.gh-email-debug-failure svg {
+    height: 16px;
+    width: 16px;
+    margin-right: 4px;
+}
+
+.gh-email-debug-failure-details {
+    display: flex;
+    flex-direction: column;
+    gap: 2px;
+    width: 100%;
+}
+
+.gh-email-debug-failure-codes {
+    display: flex;
+    gap: 20px;
+}
+
+.gh-email-debug-failure-code {
+    color: var(--midgrey);
+}
+
+.gh-email-debug-failure-code span {
+    color: var(--darkgrey);
+    font-weight: 500;
+}
+
+.gh-email-debug .gh-list-data {
+    height: 98px;
+}
+
+.gh-email-debug-permanent-failures .gh-list-data,
+.gh-email-debug-temporary-failures .gh-list-data {
+    height: 80px;
+}
+
+.gh-email-debug-batch-col-status span {
+    display: inline-block;
+    position: relative;
+    padding-left: 16px;
+    color: var(--midlightgrey);
+}
+
+.gh-email-debug-batch-col-status span::before {
+    display: block;
+    position: absolute;
+    content: "";
+    top: 6px;
+    left: 0;
+    width: 8px;
+    height: 8px;
+    border-radius: 999px;
+    background: var(--midlightgrey);
+}
+
+.gh-email-debug-batch-col-status .failed {
+    color: color-mod(var(--red) l(-2%));
+}
+
+.gh-email-debug-batch-col-status .failed::before {
+    background: var(--red);
+}
+
+.gh-email-debug-batch-col-status .submitting {
+    color: var(--blue);
+}
+
+.gh-email-debug-batch-col-status .submitting::before {
+    background: var(--blue);
+}
+
+.gh-email-debug-batch-col-status .submitted {
+    color: var(--green);
+}
+
+.gh-email-debug-batch-col-status .submitted::before {
+    background: var(--green);
+}
+
+.gh-email-debug-batch-col-created,
+.gh-email-debug-batch-col-details {
+    color: var(--midgrey);
+}
+
+.gh-email-debug-batch-col-created span,
+.gh-email-debug-batch-col-segment span {
+    white-space: nowrap;
+}
+
+.gh-email-debug-batch-col-details .detailtext div {
+    word-break: break-all;
+}
+
+.gh-email-debug-batch-col-details .detailtext .noselect {
+    user-select: none;
+}
+
+.gh-email-debug-batch-col-details .detailtext div code {
+    white-space: unset;
+    word-break: normal;
+    user-select: text;
+}
+
+.gh-email-debug-batch-col-details .error {
+    color: color-mod(var(--red) l(-2%));
+    font-weight: unset;
+}
+
+.gh-email-debug-batch-col-segment span {
+    display: inline-block;
+    border-radius: 2px;
+    background: color-mod(var(--black) a(5%));
+    padding: 1px 6px;
+    color: var(--middarkgrey);
+}
+
+.gh-email-debug-batch-col-details span {
+    color: var(--darkgrey);
+    font-weight: 500;
+}
+
+.gh-email-debug-batch-col-details .download-icon {
+    width: 20px;
+    height: 20px;
+    margin-left: 20px;
+}
+
+.gh-email-debug-batch-col-details .download-icon path {
+    stroke: var(--midgrey);
+}
+
+.gh-email-debug-batch-col-details .detailtext {
+    flex-grow: 1;
+}
+
+.gh-email-debug-settings {
+    font-size: 1.3rem;
+    margin: 12px 0 20px;
+}
+
+.gh-email-debug-settings .gh-type-number {
+    font-variant-numeric: tabular-nums;
+}
+
+.gh-email-debug-settings hr {
+    margin: 8px 0;
+    border-top-color: var(--whitegrey);
+}
+
+.gh-email-debug-settings tr td {
+    font-weight: 500;
+    padding: 6px 0;
+}
+
+.gh-email-debug-settings tr td:first-of-type {
+    width: 30%;
+    white-space: nowrap;
+    color: var(--midgrey);
+}
+
+.gh-email-debug-settings-icon svg {
+    width: 14px;
+    height: 14px;
+}
+
+.gh-email-debug-settings-icon .check {
+    width: 18px;
+    height: 18px;
+}
+
+.gh-email-debug-settings-icon .check path {
+    stroke: var(--green);
+    stroke-width: 2.5;
+}
+
+.gh-email-debug-settings-icon .x path {
+    stroke: var(--midgrey);
+}
+
+.gh-email-debug-schedule-analytics {
+    display: flex;
+    align-items: center;
+    width: max-content;
+    margin: .8rem 0 0;
+    color: var(--green-d1);
+}
+
+.gh-email-debug-schedule-analytics svg {
+    width: 1rem;
+    height: 1rem;
+    margin-right: 6px;
+}
+
+.gh-email-debug-schedule-analytics svg g {
+    stroke: var(--green-d1);
+    stroke-width: 3px;
+}
+
+.gh-email-debug-empty-list {
+    margin: 120px 40px;
+    text-align: center;
+    font-size: 1.3rem;
+    color: var(--midgrey);
+}
+
+.gh-email-debug-readmore-error {
+    display: inline-flex;
+    width: 100%;
+}
+
+.gh-email-debug-readmore-error label {
+    order: 3;
+    cursor: pointer;
+}
+
+.gh-email-debug-readmore-error .toggle-checkbox {
+    display: none;
+}
+
+.gh-email-debug-readmore-error span {
+    display: -webkit-box;
+    -webkit-box-orient: vertical;
+    -webkit-line-clamp: 1;
+    overflow: hidden;
+    color: color-mod(var(--red) l(-2%));
+    word-break: break-all;
+}
+
+.gh-email-debug-readmore-error .toggle-checkbox:checked ~ span {
+    display: block;
+    -webkit-box-orient: unset;
+    -webkit-line-clamp: unset;
+    overflow: unset;
+    word-break: break-word;
+}
+
+.gh-email-debug-readmore-error .toggle-checkbox:checked ~ label {
+    display: none !important;
+}
+
+.gh-email-debug-readmore-error svg {
+    width: 12px;
+    height: 12px;
+    margin: 0;
+}
+
+.gh-email-debug-readmore-error svg circle {
+    fill: var(--midgrey);
+}
+
+.gh-email-debug-readmore-error label {
+    display: flex;
+    align-items: center;
+    padding: 0 4px;
+    border-radius: 2px;
+    height: 14px;
+    margin-top: 3px;
+    margin-left: 8px;
+    background: var(--whitegrey);
+}
diff --git a/ghost/admin/app/styles/layouts/settings.css b/ghost/admin/app/styles/layouts/settings.css
deleted file mode 100644
index 23b1da32528..00000000000
--- a/ghost/admin/app/styles/layouts/settings.css
+++ /dev/null
@@ -1,3906 +0,0 @@
-/* Settings menu
-/* ---------------------------------------------------------- */
-.gh-nav-settings-close {
-    margin: 26px 0;
-    padding: 0;
-}
-
-.gh-nav-settings-close h4 {
-    display: flex;
-    width: 100%;
-    align-items: center;
-    justify-content: space-between;
-    padding: 2px 28px;
-    font-size: 1.9rem;
-}
-
-.gh-nav-settings-close a {
-    display: flex;
-    padding: 5px 4px 2px;
-    width: 30px;
-    height: 30px;
-    border-radius: 999px;
-    margin: 0 -12px 0 0;
-    align-items: center;
-    justify-content: center;
-}
-
-.gh-nav-settings-close a:hover {
-    background: var(--mainmenu-color-active-bg);
-}
-
-.gh-nav-settings-close a svg {
-    width: 16px;
-    height: 16px;
-    margin-top: -3px;
-}
-
-.gh-nav-settings-main {
-    margin: 7px 0;
-}
-
-.gh-nav-settings-main .active {
-    background: none !important;
-    font-weight: 400;
-    color: color-mod(var(--middarkgrey) l(-10%));
-}
-
-
-/* Settings
-/* ---------------------------------------------------------- */
-.gh-settings-main-grid {
-    display: grid;
-    grid-template-columns: 1fr 1fr 1fr;
-    grid-auto-rows: minmax(72px, auto);
-    background: var(--white);
-    border-radius: .5rem;;
-    grid-gap: 24px;
-    margin: 24px 0 96px;
-}
-
-.gh-settings-main-grid .gh-setting-group {
-    display: flex;
-    color: var(--darkgrey);
-    min-height: 72px;
-    text-align: left;
-}
-
-.gh-settings-main-grid .gh-setting-group span {
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    padding: 5px;
-    background: var(--black);
-    width: 48px;
-    height: 48px;
-    min-width: 48px;;
-    border-radius: 999px;
-    color: #fff;
-}
-
-.gh-settings-main-grid .gh-setting-group span.yellow {
-    background: var(--yellow);
-}
-
-.gh-settings-main-grid .gh-setting-group span.green {
-    background: var(--green);
-}
-
-.gh-settings-main-grid .gh-setting-group span.blue {
-    background: var(--blue);
-}
-
-.gh-settings-main-grid .gh-setting-group span.pink {
-    background: var(--pink);
-}
-
-.gh-settings-main-grid .gh-setting-group:hover span {
-    opacity: 0.9;
-}
-
-.gh-settings-main-grid .gh-setting-group svg {
-    width: 20px;
-    height: 20px;
-}
-
-.gh-settings-main-grid .gh-setting-group.portal svg {
-    width: 24px;
-    height: 24px;
-}
-
-.gh-settings-main-grid .gh-setting-group div {
-    margin-left: 14px;
-    flex-shrink: 1;
-}
-
-.gh-settings-main-grid .gh-setting-group h4 {
-    font-size: 1.5rem;
-    letter-spacing: 0;
-    font-weight: 600;
-    margin: 4px 0 2px;
-}
-
-.gh-settings-main-grid .gh-setting-group p {
-    color: var(--midgrey);
-    margin: 4px 0 0;
-    padding: 0;
-    line-height: 1.4em;
-}
-
-@media (max-width: 1100px) {
-    .gh-settings-main-grid {
-        grid-template-columns: 1fr 1fr;
-    }
-}
-
-@media (max-width: 680px) {
-    .gh-settings-main-grid {
-        grid-template-columns: 1fr;
-    }
-}
-
-/* Setting headers */
-
-.gh-setting-header {
-    color: var(--black);
-    text-transform: uppercase;
-    font-weight: 500;
-    letter-spacing: 0.03em;
-    font-size: 1.1rem;
-    padding: 8px 0;
-    border-bottom: 1px solid var(--main-color-area-divider);
-    margin: 0 0 0 1px;
-}
-
-.gh-first-header {
-    margin-top: 0;
-}
-
-.gh-setting,
-.gh-setting-first,
-.gh-setting-last {
-    display: flex;
-    justify-content: space-between;
-    padding: 18px 0;
-    margin: 0;
-}
-
-.gh-setting-first {
-    border: none;
-    padding-top: 0px;
-}
-
-.gh-setting-first .description-container {
-    margin-bottom: 0;
-}
-
-.gh-setting-last {
-    padding-bottom: 0px;
-}
-
-.gh-setting-content {
-    width: 100%;
-    margin: 0 50px 0 0;
-}
-
-.gh-members-setting-content {
-    width: 100%;
-    margin: 0;
-}
-
-.gh-setting-content--no-action {
-    margin: 0;
-}
-
-.gh-setting-title {
-    display: block;
-    margin-bottom: 12px;
-    font-size: 1.5rem;
-    letter-spacing: 0;
-    line-height: 1.15em;
-    font-weight: 600;
-    color: var(--black);
-}
-
-.gh-setting-title.m {
-    font-size: 1.4rem;
-    font-weight: 500;
-}
-
-.gh-setting-title.mb0 {
-    margin-bottom: 0;
-}
-
-.gh-setting-desc {
-    line-height: 1.4em;
-    color: var(--middarkgrey);
-    letter-spacing: 0.3px;
-    font-size: 1.3rem;
-    font-weight: 400;
-    margin: 8px 0 0;
-}
-
-.gh-setting-desc.mb0 {
-    margin-bottom: 0;
-}
-
-.gh-setting-title + .gh-setting-desc {
-    margin-top: -6px;
-}
-
-.gh-setting-error {
-    margin-top: 1em;
-    line-height: 1.3em;
-    color: var(--red);
-    font-weight: 300;
-    letter-spacing: 0.3px;
-}
-
-:is(.gh-setting-title, .gh-setting-desc) + .gh-setting-error {
-    margin-top: -4px;
-    font-size: 1.3rem;
-}
-
-.gh-setting-title + .gh-setting-error {
-    margin-top: 8px;
-}
-
-.gh-setting-action {
-    flex-shrink: 0;
-    margin: 1px 0 0 0;
-    align-self: center;
-}
-
-.gh-setting-action .for-checkbox label,
-.gh-setting-action .for-radio label {
-    padding-bottom: 0;
-    margin-bottom: 0;
-}
-
-.gh-setting-content-extended label {
-    display: block;
-    font-size: 1.3rem;
-    font-weight: 600;
-    color: var(--darkgrey);
-    margin-bottom: 4px;
-}
-
-.gh-setting-content-extended textarea {
-    font-size: 1.5rem;
-    letter-spacing: 0;
-    line-height: 1.4em;
-    max-width: initial;
-}
-
-.gh-setting-content-extended .gh-image-uploader {
-    margin: 0;
-    border: 1px solid var(--whitegrey-d2);
-}
-
-.gh-setting-content-extended .gh-btn span {
-    height: 36px;
-    line-height: 36px;
-}
-
-.gh-setting-liquid-section .liquid-container,
-.gh-setting-liquid-section .liquid-child {
-    padding: 0 20px;
-    margin: 0 -20px;
-}
-
-.gh-settings-portal-section {
-    box-shadow:
-        0 0 1px rgba(0,0,0,.07),
-        0 1.5px 1.2px -11px rgba(0, 0, 0, 0.028),
-        0 5.1px 4px -11px rgba(0, 0, 0, 0.042),
-        0 23px 18px -16px rgba(0, 0, 0, 0.07)
-    ;
-}
-
-.gh-settings-portal-border {
-    position: absolute;
-    content: "";
-    top: -5px;
-    right: -5px;
-    left: -5px;
-    bottom: -5px;
-    border: 1px solid var(--blue);
-    border-radius: 8px;
-}
-
-
-/* Images */
-
-.gh-setting-action-smallimg {
-    position: relative;
-}
-
-.gh-setting-action-smallimg img,
-.gh-setting-action-smallimg input[type="image"] {
-    height: 50px;
-    width: auto;
-    max-width: 250px;
-}
-
-.gh-setting-action-largeimg img,
-.gh-setting-action-largeimg input[type="image"] {
-    min-height: 80px;
-    width: auto;
-    max-width: 250px;
-}
-
-@media (max-width: 500px) {
-    .gh-setting-action-largeimg img,
-    .gh-setting-action-largeimg input[type="image"] {
-        max-width: 190px;
-    }
-}
-
-.gh-setting-action-smallimg img:hover,
-.gh-setting-action-largeimg img:hover,
-.gh-setting-action-smallimg input[type="image"],
-.gh-setting-action-largeimg input[type="image"] {
-    cursor: pointer;
-}
-
-.gh-setting-action-smallimg-delete,
-.gh-setting-action-largeimg-delete {
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    color: var(--midgrey);
-    margin-top: 8px;
-    color: var(--whitegrey);
-    text-decoration: none;
-    font-size: 13px;
-    line-height: 10px;
-}
-
-.gh-setting-action-smallimg-delete:hover,
-.gh-setting-action-largeimg-delete:hover {
-    color: var(--white);
-    text-decoration: underline;
-}
-
-.gh-setting-action .gh-progress-container {
-    width: 113px;
-    height: 100%;
-}
-
-.gh-setting-action .gh-progress-container-progress {
-    width: 100%;
-}
-
-.gh-setting-action .gh-progress-bar {
-    height: 9px;
-}
-
-/* Checkboxes */
-
-.gh-setting-action .input-toggle-component {
-    float: none;
-    margin-right: 0;
-    width: 24px;
-    height: 24px;
-}
-
-.gh-setting-action .input-toggle-component:before {
-    top: 6px;
-    left: 5px;
-    width: 12px;
-    height: 7px;
-}
-
-.gh-setting-content-extended {
-    width: 100%;
-}
-
-/* Theme Directory
-/* ---------------------------------------------------------- */
-
-.gh-td-marketplace {
-    display: inline-block;
-    outline: none;
-    color: var(--green-d1);
-    font-weight: 500;
-    text-decoration: none !important;
-    text-transform: none;
-}
-
-.gh-td-marketplace span {
-    display: block;
-    overflow: hidden;
-    font-size: 1.35rem;
-    letter-spacing: 0.2px;
-}
-
-.gh-td-marketplace span svg {
-    position: relative;
-    top: 1px;
-    width: .7em;
-    height: .7em;
-    margin-left: 4px;
-}
-
-.gh-td-marketplace span svg path {
-    stroke: var(--green-d1);
-    stroke-width: 4px;
-}
-
-.td-item {
-    display: flex;
-    flex-direction: column;
-    justify-content: center;
-    align-items: center;
-    width: 100%;
-    text-align: center;
-    text-decoration: none;
-    color: var(--darkgrey);
-    transition: all .8s ease;
-}
-
-.td-item img {
-    box-shadow: 0 0 1px rgba(0,0,0,.02), 0 9px 25px -10px rgba(0,0,0,0.2);
-    transition: all .8s ease;
-    border-radius: 3px;
-}
-
-.td-item svg circle {
-    stroke: var(--midlightgrey);
-}
-
-.td-item:hover {
-    transform: translateY(-1%);
-    transition: all .3s ease;
-}
-
-.td-item:hover img {
-    box-shadow: 0 0 1px rgba(0,0,0,.02), 0 19px 35px -14px rgba(0,0,0,.2);
-    transition: all .3s ease;
-}
-
-.td-item-desc {
-    display: flex;
-    width: 100%;
-    margin-top: 16px;
-    text-transform: uppercase;
-    font-weight: 700;
-}
-
-.td-item-category {
-    display: inline-flex;
-    align-items: center;
-    margin-left: 4px;
-    text-transform: none;
-    font-weight: 400;
-    font-size: 1em;
-    color: color-mod(var(--midgrey) l(-5%));
-}
-
-.td-item-screenshot {
-    line-height: 0;
-    border-radius: 3px;
-}
-
-.td-item-overlay {
-    position: absolute;
-    top: 0;
-    right: 0;
-    bottom: 0;
-    left: 0;
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    justify-content: center;
-}
-
-.td-item-overlay:hover,
-.td-item-overlay:focus {
-    background-color: var(--white-90);
-    transition: all .3s ease;
-}
-
-.td-item-action {
-    visibility: hidden;
-    opacity: 0;
-    transition: visibility 0s, opacity 0.3s ease;}
-
-.td-item-overlay:hover .td-item-action {
-    visibility: visible;
-    opacity: 1;
-}
-
-.td-item-action.gh-btn {
-    width: 80px;
-}
-
-@media (max-width: 1000px) {
-    .td-item:nth-child(4),
-    .td-item:nth-child(5),
-    .td-item:nth-child(6) {
-        display: flex;
-    }
-}
-
-/* General
-/* ---------------------------------------------------------- */
-.gh-general-settings {
-    display: grid;
-    grid-template-columns: 2fr 1fr;
-    grid-gap: 80px;
-}
-
-@media (max-width: 1200px) {
-    .gh-general-settings {
-        display: flex;
-        flex-direction: column;
-        gap: 0;
-    }
-
-    .gh-general-settings .gh-copyright-info {
-        max-width: 620px !important;
-    }
-}
-
-.gh-general-settings .gh-expandable-header .gh-expandable-description {
-    max-width: 620px;
-}
-
-.gh-seo-settings {
-    display: flex;
-}
-
-@media (max-width: 1360px) {
-    .gh-seo-settings {
-        flex-direction: column;
-    }
-
-    .gh-seo-settings .form-group {
-        max-width: 100%;
-    }
-
-    .gh-seo-settings-left,
-    .gh-seo-container {
-        max-width: 591px;
-    }
-}
-
-@media (min-width: 1360px) {
-    .gh-seo-settings-left {
-        margin-right: 2.4rem;
-    }
-
-    .gh-seo-container {
-        max-width: 1091px;
-    }
-}
-
-.gh-seo-container {
-    display: flex;
-    width: 100%;
-    margin-bottom: 2.4rem;
-    padding: 20px 30px 16px;
-    border: 1px solid var(--whitegrey-d1);
-    font-family: Arial, sans-serif;
-    background: #fff;
-    border-radius: 3px;
-}
-
-.gh-seo-container svg {
-    width: 92px;
-    height: 30px;
-    margin-right: 32px;
-}
-
-.gh-general-settings .gh-seo-settings {
-    flex-direction: column;
-}
-
-.gh-general-settings .gh-seo-settings .form-group {
-    max-width: 100%;
-}
-
-.gh-general-settings .gh-seo-settings-left,
-.gh-general-settings .gh-seo-container {
-    max-width: 591px;
-}
-
-.gh-twitter-settings {
-    display: flex;
-}
-
-@media (max-width: 1360px) {
-    .gh-twitter-settings {
-        flex-direction: column;
-    }
-
-    .gh-twitter-settings .form-group {
-        max-width: 100%;
-    }
-
-    .gh-twitter-settings-left {
-        max-width: 591px;
-    }
-}
-
-@media (min-width: 1360px) {
-    .gh-twitter-settings-left {
-        margin-right: 2.4rem;
-    }
-}
-
-.gh-twitter-container {
-    width: 591px;
-    margin-bottom: 2.4rem;
-    border: 1px solid var(--whitegrey-d1);
-    background: #fff;
-    border-radius: 3px;
-}
-
-@media (max-width: 1080px) {
-    .gh-twitter-container {
-        width: 100%;
-        max-width: 591px;
-    }
-}
-
-.gh-general-settings .gh-twitter-settings {
-    flex-direction: column;
-}
-
-.gh-general-settings .gh-twitter-settings .form-group {
-    max-width: 100%;
-}
-
-.gh-general-settings .gh-twitter-settings-left,
-.gh-general-settings .gh-twitter-container {
-    max-width: 591px;
-}
-
-.gh-og-settings {
-    display: flex;
-}
-
-@media (max-width: 1360px) {
-    .gh-og-settings {
-        flex-direction: column;
-    }
-
-    .gh-og-settings .form-group {
-        max-width: 100%;
-    }
-
-    .gh-og-settings-left {
-        max-width: 591px;
-    }
-}
-
-@media (min-width: 1360px) {
-    .gh-og-settings-left {
-        margin-right: 2rem;
-    }
-}
-
-.gh-og-container {
-    width: 476px;
-    margin-bottom: 2.4rem;
-    border: 1px solid var(--whitegrey-d1);
-    background: #fff;
-    border-radius: 3px;
-}
-
-@media (max-width: 1080px) {
-    .gh-og-container {
-        width: 100%;
-        max-width: 476px;
-    }
-}
-
-.gh-general-settings .gh-og-settings {
-    flex-direction: column;
-}
-
-.gh-general-settings .gh-og-settings .form-group {
-    max-width: 100%;
-}
-
-.gh-general-settings .gh-og-settings-left,
-.gh-general-settings .gh-og-container {
-    max-width: 591px;
-}
-
-.gh-general-settings .gh-about-box {
-    margin-top: 19px;
-    position: relative;
-    top: unset;
-    right: unset;
-}
-
-.gh-general-settings .gh-copyright-info {
-    border-top: none;
-    max-width: 350px;
-    margin-top: 12px;
-    padding-top: 0;
-}
-
-.gh-about-links {
-    margin: 0;
-    padding: 0;
-    list-style: none;
-    margin-top: 12px;
-    padding-top: 12px;
-    border-top: 1px solid var(--lightgrey-l2);
-}
-
-.gh-about-links li {
-    margin: 0 0 4px;
-    font-size: 1.4rem;
-    line-height: 1.8em;
-}
-
-.gh-about-links li a span {
-    display: flex;
-    align-items: center;
-}
-
-.gh-about-links li a span svg {
-    width: 16px;
-    height: 16px;
-    margin-right: 6px;
-}
-
-.gh-about-links li a {
-    color: var(--middarkgrey);
-}
-
-.gh-about-links li a:hover {
-    color: var(--black);
-}
-
-.gh-about-links:last-of-type {
-    margin-bottom: -12px;
-}
-
-.gh-about-links .calendar-icon {
-    width: 14px;
-    height: 14px;
-    margin-right: 8px;
-}
-
-.gh-about-links li a:hover .hover-stroke path {
-    stroke: var(--black);
-}
-
-.gh-about-links li a:hover .hover-fill path {
-    fill: var(--black);
-}
-
-/* Navigation
-/* ---------------------------------------------------------- */
-
-.gh-blognav-container {
-    padding: 25px 0;
-    border-top: var(--lightgrey) 1px solid;
-}
-
-.gh-blognav {
-    margin: 8px 0 0;
-}
-
-.gh-blognav-item {
-    display: flex;
-    align-items: center;
-    margin-bottom: 10px;
-}
-
-.gh-blognav-item--error {
-    margin-bottom: calc(1em + 10px);
-}
-
-.gh-blognav-item .response {
-    position: absolute;
-    margin-bottom: 0;
-}
-
-.gh-blognav-grab {
-    padding: 6px 16px 0 0;
-    width: 16px;
-    text-indent: -4px;
-    cursor: move;
-}
-
-.gh-blognav-grab svg {
-    width: 16px;
-    height: 16px;
-    fill: color-mod(var(--midgrey) l(+15%));
-}
-
-.gh-blognav-line {
-    display: flex;
-    width: 100%;
-}
-
-.gh-blognav-label {
-    flex-grow: 1;
-    margin-right: 10px;
-}
-
-.gh-blognav-url {
-    flex-grow: 3;
-}
-
-.gh-blognav-delete {
-    padding: 8px 0 8px 10px;
-    display: flex;
-    align-items: center;
-    color: var(--midgrey);
-    transition: fill 0.1s linear;
-}
-
-.gh-blognav-delete:hover {
-    color: var(--red);
-}
-
-.gh-blognav-delete svg {
-    height: 14px;
-    width: 14px;
-}
-
-.gh-blognav-add {
-    margin-right: -1px;
-    margin-left: 9px;
-    width: 16px;
-    height: 16px;
-    background: var(--green);
-    color: var(--white);
-    border-radius: 2px;
-    transition: background 0.1s linear;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-}
-
-.gh-blognav-add svg {
-    height: 9px;
-    width: 9px;
-}
-
-.gh-blognav-add:hover,
-.gh-blognav-add:focus {
-    background: color-mod(var(--green) lightness(-10%));
-}
-
-.gh-blognav-item:not(.gh-blognav-item--sortable) {
-    padding-left: 16px;
-    margin-bottom: 0;
-}
-
-/* Remove space between inputs on smaller screens */
-@media (max-width: 800px) {
-    .gh-blognav-label {
-        margin-right: -1px;
-    }
-    .gh-blognav-label input {
-        border-right-color: color-mod(var(--lightgrey) l(-5%) s(-10%));
-        border-radius: 4px 0 0 4px;
-    }
-    .gh-blognav-url input {
-        border-left-color: color-mod(var(--lightgrey) l(-5%) s(-10%));
-        border-radius: 0 4px 4px 0;
-    }
-    .gh-blognav-item input:focus {
-        position: relative;
-        z-index: 100;
-    }
-}
-
-
-/* Email newsletter
-/* ---------------------------------------------------------- */
-
-.gh-setting-email hr {
-    margin: 4.8em 0;
-}
-
-.gh-email-design-typography-wrapper .gh-setting-dropdown .ember-power-select-status-icon {
-    right: 16px;
-}
-
-.gh-mailgun-region {
-    width: 140px !important;
-    margin-right: 12px;
-}
-
-.gh-mailgun-region .ember-power-select-trigger {
-    padding: 6px 12px;
-    white-space: nowrap;
-    background: var(--white);
-}
-
-.gh-mailgun-region .ember-power-select-selected-item {
-    margin-left: 0;
-}
-
-.gh-mailgun-region .ember-power-select-trigger svg {
-    position: absolute;
-    top: 50%;
-    right: 16px;
-    width: 10px;
-    height: 6px;
-}
-
-
-/* Email newsletter LABS
-/* ---------------------------------------------------------- */
-
-.gh-newsletters .gh-dropdown-archived {
-    color: var(--darkgrey);
-    font-size: 1.35rem;
-    font-weight: 400;
-}
-
-.gh-newsletters .gh-expandable-title {
-    font-size: 1.5rem;
-    letter-spacing: 0;
-    font-weight: 600;
-    color: var(--black);
-    margin: 0;
-    padding: 0;
-}
-
-.gh-newsletters .gh-expandable-description {
-    margin: 0 0 1.8rem;
-    padding: 0;
-    color: var(--midgrey);
-    font-size: 1.3rem;
-    font-weight: 400;
-}
-
-.gh-newsletters .gh-expandable-block {
-    padding: 24px;
-
-    /* Correct last card margin by reducing bottom padding */
-    padding-bottom: 12px;
-}
-
-.gh-newsletter-tracking {
-    padding: 16px 20px;
-    background: var(--main-bg-color);
-    box-shadow: 0 1px 4px -1px rgb(0 0 0 / 10%);
-    border-radius: 3px;
-}
-
-.gh-newsletter-tracking-row {
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    border-bottom: 1px solid var(--whitegrey);
-    padding: 16px 0;
-}
-
-.gh-newsletter-tracking-row:first-child {
-    padding-top: 0;
-}
-
-.gh-newsletter-tracking-row:last-child {
-    padding-bottom: 0;
-    border-bottom: none;
-}
-
-.gh-newsletter-tracking-title {
-    font-weight: 600;
-    font-size: 1.4rem;
-    margin-bottom: 0;
-}
-
-.gh-newsletter-card-container {
-    margin-left: -24px;
-    padding-left: 24px;
-    position: relative;
-}
-
-.gh-newsletters .gh-main-content-card:last-of-type {
-    /* Note that we need to keep the margin of the cards consistent, or they'll jump when we drag the cards to sort them */
-    margin-bottom: 12px;
-}
-
-.gh-newsletter-card {
-    position:relative;
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-}
-
-.gh-newsletter-card-container[draggable="true"] {
-    /* required to avoid background being picked up when dragging (Chrome only) */
-    z-index: 1;
-}
-
-.gh-newsletter-card-container .grab-newsletter {
-    visibility: hidden;
-    position: absolute;
-    top: 0;
-    left: 8px;
-    width: 2rem;
-    height: 100%;
-    padding-right: 2px;
-    fill: var(--lightgrey-d2);
-    cursor: move;
-    opacity: 0;
-    transition: visibility 200ms step-end, opacity 200ms ease-in-out;
-}
-
-.gh-newsletter-card {
-    transition: margin 125ms ease-in-out, padding 125ms ease-in-out;
-}
-
-/*
-    When dragging, the :hover selector could be on the wrong element. So we explicitly ignore :hover when we are dragging and switch to the .is-dragging-object
-*/
-body:not([data-user-is-dragging]) .gh-newsletter-card-draggable:hover .gh-newsletter-card, .gh-newsletter-card-draggable.is-dragging-object .gh-newsletter-card {
-    margin-left: 4px;
-    padding-left: 20px;
-}
-
-body:not([data-user-is-dragging]) .gh-newsletter-card-draggable:hover .grab-newsletter, .gh-newsletter-card-draggable.is-dragging-object .grab-newsletter {
-    visibility: visible;
-    opacity: 1;
-
-    /*
-        To make sure the grab handler also fades out correctly and only change visibility after the animation,
-        we need to update the animation curve for visibility to step-start at the start of the animation
-    */
-    transition: visibility 200ms step-start, opacity 200ms ease-in-out;
-}
-
-.gh-newsletter-card-container .grab-newsletter {
-    display: none;
-}
-
-.gh-newsletter-card-draggable .grab-newsletter {
-    display: inline-block;
-}
-
-.gh-newsletter-card-block.title-block {
-    flex-basis: 60%;
-}
-
-.gh-newsletter-card-block.stats-block {
-    display: grid;
-    flex-basis: 30%;
-    grid-template-columns: 1fr 1fr;
-}
-
-.gh-newsletter-card-block.stats-block.multiple {
-    margin-right: -4.4rem;
-}
-
-.gh-newsletter-card-block.cta-block {
-    display: flex;
-}
-
-.gh-newsletter-card-block:not(:first-of-type) {
-    padding-left: 16px;
-}
-
-.gh-newsletter-card-block h4 {
-    font-size: 1.3rem;
-    font-weight: 500;
-}
-
-.gh-newsletter-card-block h4 .counter {
-    font-weight: 400;
-    color: var(--midgrey);
-}
-
-.gh-newsletter-card-name {
-    display: flex;
-    align-items: center;
-    margin: 0;
-    font-size: 1.8rem;
-    font-weight: 600;
-    line-height: 1.3em;
-}
-
-.stats-block .gh-newsletter-card-name {
-    font-size: 1.7rem;
-}
-
-.gh-newsletter-card-description {
-    font-size: 1.3rem;
-    line-height: 1.45em;
-    margin: 4px 20px 4px 0;
-    color: var(--midgrey);
-}
-
-.gh-newsletter-card-button-container {
-    position: absolute;
-    right: 24px;
-    top: 24px;
-    margin-right: 0;
-}
-
-.gh-newsletter-actions-menu {
-    margin-top: 4px;
-    background: none;
-}
-
-.gh-add-newsletter {
-    display: flex;
-    align-items: center;
-    width: max-content;
-    margin: .8rem 0 0;
-    color: var(--green-d1);
-}
-
-.gh-add-newsletter svg {
-    width: 1rem;
-    height: 1rem;
-    margin-right: 6px;
-}
-
-.gh-newsletters-setting-sectionheading {
-    font-size: 1.1rem;
-    font-weight: 600;
-    text-transform: uppercase;
-    letter-spacing: 0.2px;
-    color: var(--midgrey-l1);
-    margin: 0 0 16px;
-    padding: 0 0 8px;
-    border-bottom: 1px solid var(--whitegrey);
-}
-
-.gh-newsletters-labs .form-group.vertical p {
-    margin: 4px 0 0;
-}
-
-.gh-newsletters-labs .modal-fullsettings-uploader {
-    flex-grow: 1;
-    margin: 0;
-}
-
-.gh-newsletters-labs .gh-header-img-uploadicon {
-    background: var(--whitegrey-l2);
-}
-
-.gh-newsletters-labs .gh-email-design-typography-wrapper.header .gh-btn-group {
-    background: var(--whitegrey-d1);
-}
-
-.gh-newsletters-labs .gh-stack-item .tooltip-top-left::before {
-    width: max-content;
-    max-width: 320px;
-    white-space: normal;
-    word-break: break-word;
-    text-align: left;
-}
-
-.gh-newsletters-labs .gh-members-emailsettings-footer {
-    margin-top: auto;
-    margin-bottom: 0;
-}
-
-.gh-newsletters-labs .gh-members-emailpreview-container {
-    margin: 16px auto 32px;
-}
-
-.gh-newsletters-labs .gh-members-emailpreview-faux {
-    height: 88px;
-    background: var(--whitegrey-l2);
-}
-
-.gh-newsletters-labs .gh-members-emailpreview-faux .dark,
-.gh-newsletters-labs .gh-members-emailpreview-faux .strong {
-    color: var(--darkgrey);
-    font-size: 1.4rem;
-    font-weight: 600;
-}
-
-.gh-newsletters-labs .gh-members-emailpreview-faux p {
-    color: var(--midgrey-l2);
-}
-
-/* Customise email newsletter LABS
-/* ---------------------------------------------------------- */
-
-.modal-fullsettings-form-labs.email-design .modal-fullsettings-tab-expanded {
-    padding: 20px 32px;
-}
-
-.modal-fullsettings-form-labs.email-design .gh-stack-item {
-    margin: 12px 0;
-}
-
-
-/* Code injection
-/* ---------------------------------------------------------- */
-
-.settings-code {
-    max-width: 100%;
-}
-
-.settings-code label {
-    font-size: 1.5rem;
-    letter-spacing: 0;
-    margin-bottom: 2px;
-}
-
-.settings-code p {
-    margin: 0 0 8px;
-    font-size: 1.3rem;
-}
-
-.settings-code code {
-    background-color: rgb(242, 244, 247);
-    border: 1px solid var(--lightgrey);
-    vertical-align: middle;
-    font-size: 1.2rem;
-}
-
-.settings-code-editor {
-    padding: 0;
-    min-width: 250px;
-    min-height: 300px;
-    max-width: 1224px;
-    width: calc(100vw - 416px) !important;
-    height: auto;
-    line-height: 22px;
-    border: 1px solid var(--lightgrey);
-}
-
-.settings-code-editor:hover {
-    cursor: text;
-}
-
-.settings-code-editor textarea {
-    width: 100%;
-    max-width: none;
-    min-height: 300px;
-    line-height: 22px;
-    border: none;
-}
-
-.settings-code-editor .CodeMirror {
-    padding: 0;
-    border: none;
-    border-radius: inherit;
-    background: var(--white);
-    color: var(--darkgrey);
-}
-
-.settings-code-editor .CodeMirror-gutters {
-    background-color: var(--whitegrey-l2);
-    border-right: 1px solid var(--lightgrey);
-}
-
-.settings-code-editor .CodeMirror-cursor {
-    border: 1px solid var(--midgrey);
-}
-
-.settings-code-editor .cm-s-xq-light span.cm-meta {
-    color: #000;
-}
-
-@media (max-width: 800px) {
-    .settings-code-editor {
-        width: calc(100vw - 8vw - 40px) !important;
-    }
-}
-
-
-
-/* Labs
-/* ---------------------------------------------------------- */
-
-#startupload {
-    line-height: inherit;
-}
-
-@media (max-width: 500px) {
-    #importfile {
-        flex-direction: column;
-    }
-    #importfile input {
-        width: 150px;
-    }
-
-    #startupload {
-        margin-left: 0;
-        margin-top: 5px;
-    }
-}
-
-.gh-import-errors {
-    position: relative;
-    padding: 12px 10px 14px 10px;
-    border: 1px solid var(--lightgrey);
-    border-left-width: 5px;
-    border-left-color: var(--red);
-    color: var(--midgrey);
-    line-height: 1.4em;
-    letter-spacing: 0.2px;
-    background: #fff;
-    border-radius: 5px;
-    margin-top: 18px;
-    margin-bottom: 25px;
-}
-
-.gh-import-errors-alert {
-    border-left-color: color-mod(var(--yellow) l(-8%) s(+10%));
-}
-
-.gh-import-errors-title {
-    margin-bottom: 1em;
-    font-size: 1.8rem;
-    line-height: 1.15em;
-    font-weight: 600;
-    color: var(--red);
-}
-
-.gh-import-errors-alert .gh-import-errors-title {
-    color: color-mod(var(--yellow) l(-8%) s(+10%));
-}
-
-.gh-import-error {
-    margin-bottom: 1.75em;
-}
-
-.gh-import-error:last-of-type {
-    margin-bottom: 0;
-}
-
-.gh-import-error-message {
-    margin-bottom: 0.5em;
-    font-weight: 300;
-}
-
-.gh-import-error-entry pre {
-    margin: 0;
-    font-size: 10px;
-}
-
-.gh-setting-linkrow:hover {
-    background: var(--whitegrey-l2);
-}
-
-/* Themes
-/* ---------------------------------------------------------- */
-
-@media (max-width: 500px) {
-    .gh-themes-container .apps-configured {
-        justify-content: flex-end;
-    }
-    .gh-themes-container .apps-card-meta {
-        flex-basis: auto;
-    }
-}
-
-/*Errors */
-.theme-validation-container {
-    overflow-y: auto;
-    margin: -32px -32px 0;
-    padding: 32px 32px 0;
-    max-height: calc(100vh - 20vw);
-}
-
-@media (max-height: 960px) {
-    .theme-validation-container {
-        max-height: calc(100vh - 180px);
-    }
-}
-
-.theme-validation-container .gh-image-uploader {
-    justify-content: center;
-}
-
-.theme-validation-container .gh-image-uploader .description {
-    color: var(--green-d1);
-    font-weight: 500;
-}
-
-.theme-validation-container .gh-image-uploader .x-file-input.try-again,
-.theme-validation-container .gh-image-uploader .x-file-input.try-again label {
-    display: inline;
-}
-
-.theme-validation-item {
-    margin: 12px 0 0;
-    padding: 12px 16px 12px 28px;
-    border: 1px solid #e5eff5;
-    border-radius: 5px;
-    display: flex;
-    flex-direction: column;
-    border: 1px solid var(--lightgrey);
-}
-
-.theme-validation-item h4 {
-    margin: 0;
-    font-size: 1.4rem;
-    font-weight: 400;
-    line-height: 1.5em;
-}
-
-.theme-validation-rule-text {
-    flex-grow: 1;
-}
-
-.theme-validation-item.theme-fatal-error {
-    border: 1px solid var(--red);
-}
-
-.theme-validation-item.theme-fatal-error .theme-validation-rule-text::before,
-.theme-validation-item.theme-error .theme-validation-rule-text::before,
-.theme-validation-item.theme-warning .theme-validation-rule-text::before
-{
-    font-weight: 600;
-}
-
-.theme-validation-item.theme-fatal-error .theme-validation-rule-text::before {
-    content: "Fatal error:";
-    color: var(--red);
-}
-
-.theme-validation-item.theme-error .theme-validation-rule-text::before {
-    content: "Error:";
-}
-
-.theme-validation-item.theme-warning .theme-validation-rule-text::before {
-    content: "Warning:";
-}
-
-.theme-fatal-error .theme-validation-type-label::before,
-.theme-error .theme-validation-type-label::before,
-.theme-warning .theme-validation-type-label::before {
-    content: "";
-    display: block;
-    width: 8px;
-    height: 8px;
-    margin-top: 6px;
-    margin-left: -16px;
-    border-radius: 999px;
-}
-
-.theme-fatal-error .theme-validation-type-label::before,
-.theme-error .theme-validation-type-label::before {
-    background: color-mod(var(--red) alpha(0.85));
-}
-
-.theme-warning .theme-validation-type-label::before {
-    background: color-mod(var(--yellow));
-}
-
-.theme-validation-list ul {
-    list-style: disc;
-}
-
-.theme-validation-list code,
-.theme-validation-rule-text code {
-    font-size: 0.9em;
-}
-
-.theme-validation-item h6 {
-    font-size: 1.3rem;
-    font-weight: 500;
-}
-
-.theme-validation-toggle-details {
-    display: flex;
-    justify-content: space-between;
-    flex-grow: 1;
-    align-items: flex-start;
-    padding: 0;
-    color: var(--darkgrey);
-    text-decoration: none!important;
-    font-size: 1.3rem;
-}
-
-.theme-validation-rule-icon {
-    flex-shrink: 0;
-    margin-left: 5px;
-    width: 13px;
-    height: 14px;
-    color: var(--midgrey);
-    transition: all 0.1s ease-out;
-}
-
-.theme-validation-rule-icon svg path {
-    fill: var(--midgrey);
-}
-
-.theme-validation-details {
-    margin-top: 12px;
-    padding-top: 12px;
-    font-size: 1.3rem;
-    border-top: 1px solid var(--lightgrey);
-}
-
-p.theme-validation-details {
-    font-size: 1.3rem;
-}
-
-.theme-validation-screenshot img {
-    margin-bottom: 2rem;
-    border: 1px solid var(--main-color-area-divider);
-    border-radius: 3px;
-}
-
-
-/* Publication identity
-/* ---------------------------------------------------------- */
-.blog-logo,
-.blog-icon {
-    max-height: 50px;
-    height: auto !important;
-}
-
-/** CSS for accent color */
-.input-color-form-group {
-    display: flex;
-    align-items: flex-end;
-    flex-direction: column;
-    margin-bottom: 0;
-}
-
-.input-color {
-    display: flex;
-    position: relative;
-}
-
-.input-color:after {
-    content: "#";
-    position: absolute;
-    top: 9px;
-    left: 43px;
-    color: var(--midlightgrey);
-    font-family: "Consolas", monaco, monospace;
-    font-size: 13px;
-}
-
-.input-color:focus {
-    border: none;
-}
-
-.input-color input {
-    padding-left: 52px;
-    width: 112px;
-    height: 38px;
-    padding-right: 8px;
-    font-family: "Consolas", monaco, monospace;
-    font-size: 13px;
-}
-
-.input-color .color-box {
-    position: absolute;
-    top: 1px;
-    left: 1px;
-    width: 36px;
-    height: 36px;
-    display: inline-block;
-    background-color: var(--lightgrey);
-    border-top-left-radius: 4px;
-    border-bottom-left-radius: 4px;
-    border-right: 1px solid var(--input-border);
-    box-shadow: inset 0 0 0 1px var(--white);
-}
-
-.input-color input:focus + .color-box {
-    top: 2px;
-    left: 2px;
-    width: 35px;
-    height: 34px;
-    border-top-left-radius: 3px;
-    border-bottom-left-radius: 3px;
-}
-
-.gh-setting-unsplash-checkbox {
-    margin-bottom: 0;
-}
-
-/* Branding
-/* ---------------------------------------------------- */
-
-.gh-branding-settings {
-    display: flex;
-    align-items: stretch;
-    height: 100%;
-}
-
-.gh-branding-settings-header {
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    border-bottom: 1px solid var(--whitegrey);
-    margin: -20px -24px;
-    padding: 16px 24px;
-}
-
-.gh-branding-settings-header h4 {
-    margin: 0;
-    padding: 0;
-    font-size: 1.9rem;
-    font-weight: 600;
-}
-
-.gh-branding-settings-actions {
-    display: flex;
-    align-items: center;
-    justify-content: flex-end;
-}
-
-.gh-branding-settings-actions .close {
-    padding: 4px;
-    margin-right: 12px;
-}
-
-.gh-branding-settings-options {
-    flex-basis: 25%;
-    flex-grow: 0;
-    flex-shrink: 0;
-    border-right: 1px solid var(--whitegrey);
-    min-width: 320px;
-    max-width: 400px;
-    margin: 20px 0 -20px;
-    padding: 24px 24px 24px 0;
-    overflow-y: auto;
-    height: calc(100vh - 136px);
-}
-
-.gh-branding-image-container {
-    position: relative;
-    align-self: flex-start;
-    height: 50px;
-}
-
-.gh-branding-image-container.largeimg {
-    width: 100%;
-    display: flex;
-    height: unset;
-    min-height: 80px;
-    align-items: center;
-}
-
-.gh-branding-image-container.transparent-bg {
-    background-image: url("data:image/svg+xml,%3Csvg width='24' height='24' viewBox='0 0 24 24' xmlns='http://www.w3.org/2000/svg'%3E%3Ctitle%3ERectangle%3C/title%3E%3Cg fill='none' fill-rule='evenodd'%3E%3Cpath fill='%23E6EEF2' d='M0 0h24v24H0z'/%3E%3Cpath fill='%23D8E2E8' d='M0 0h12v12H0zM12 12h12v12H12z'/%3E%3C/g%3E%3C/svg%3E");
-}
-
-.gh-branding-settings-options .gh-setting-action-largeimg-delete,
-.gh-branding-settings-options .gh-setting-action-smallimg-delete {
-    position: absolute;
-    top: 5px;
-    right: 5px;
-    background: rgba(0, 0, 0, 0.9);
-    border: 1px solid rgba(255, 255, 255, 0.25);
-    padding: 5px;
-    margin: 0;
-    border-radius: 3px;
-    opacity: 0;
-}
-
-.gh-branding-settings-options .gh-setting-action-largeimg-delete:hover,
-.gh-branding-settings-options .gh-setting-action-smallimg-delete:hover {
-    background: var(--red);
-    border-color: transparent;
-}
-
-.gh-branding-image-container:hover .gh-setting-action-largeimg-delete,
-.gh-branding-image-container:hover .gh-setting-action-smallimg-delete {
-    opacity: 1;
-}
-
-.gh-branding-settings-right {
-    flex-grow: 1;
-    flex-basis: 100%;
-    display: flex;
-    flex-direction: column;
-    align-items: stretch;
-    margin: 20px -24px -20px 0;
-    background: var(--whitegrey-l1);
-}
-
-.gh-branding-settings-previewcontainer {
-    margin: 32px 68px 68px;
-}
-
-.gh-branding-settings-previewcontainer .site-frame {
-    width: 133.33333%;
-    height: 133.33333%;
-    transform: scale(0.75);
-    transform-origin: 0 0;
-}
-
-.gh-branding-settings .input-color input {
-    position: relative;
-    height: 30px;
-    width: 102px;
-    padding: 3px 4px 3px 44px;
-    font-size: 1.3rem;
-}
-
-.gh-branding-settings .input-color::after {
-    top: 5px;
-    left: 34px;
-}
-
-.gh-branding-settings .color-picker-horizontal-divider {
-    position: absolute;
-    display: block;
-    content: "";
-    width: 1px;
-    top: 0;
-    left: 29px;
-    bottom: 0;
-    background: var(--input-border-color);
-}
-
-.gh-branding-settings .input-color input:focus + .color-picker-horizontal-divider {
-    top: 2px;
-    bottom: 2px;
-}
-
-.gh-branding-settings .color-box-container {
-    height: 26px;
-    width: 26px;
-    position: absolute;
-    overflow: hidden;
-    top: 2px;
-    left: 2px;
-    border-top-left-radius: 2px;
-    border-bottom-left-radius: 2px;
-}
-
-.gh-branding-settings .color-box-container .color-picker {
-    position: absolute;
-    top: -10px;
-    left: -10px;
-    border: none;
-    outline: none;
-    padding: 0;
-    margin: 0;
-    width: 50px;
-    height: 50px;
-}
-
-.gh-branding-settings .gh-accent-color .gh-setting-action {
-    align-self: flex-start;
-    margin-top: 22px;
-}
-
-.gh-branding-settings .gh-accent-color .response {
-    margin: -8px 0 0;
-    font-size: 1.3rem;
-}
-
-/* Design (Labs)
-/* ---------------------------------------------------- */
-
-.gh-nav-contextual {
-    flex: 0 0 clamp(320px, 17.09vw + 86.5px, 360px);
-}
-
-.gh-nav-header {
-    display: flex;
-    align-items: center;
-    padding: 32px 32px 48px;
-    color: var(--midgrey-l2);
-    font-size: 1.35rem;
-    font-weight: 400;
-    line-height: 36px;
-    letter-spacing: .2px;
-}
-
-.gh-nav-header.no-accordion {
-    padding-bottom: 32px;
-}
-
-.gh-nav-header.no-accordion + .gh-nav-body .gh-nav-top:first-of-type .gh-nav-design-settings {
-    margin-top: 4px;
-}
-
-.gh-nav-menu-back-button {
-    display: flex;
-    align-items: center;
-    height: 36px;
-    color: var(--darkgrey);
-    background: none;
-}
-
-.gh-nav-header svg {
-    display: block;
-    width: 9px;
-    height: 9px;
-    margin: 1px 6px 0;
-}
-
-.gh-nav-header svg path {
-    stroke: var(--darkgrey-l1);
-}
-
-.gh-nav-menu-back-button:hover {
-    color: var(--black);
-}
-
-.gh-nav-design {
-    overflow-x: hidden;
-}
-
-.gh-nav-design .gh-nav-menu-title {
-    display: flex;
-    align-items: center;
-    overflow: hidden;
-    margin: 0 16px 4px 16px;
-    padding: 8px 16px;
-    color: var(--black);
-    font-size: 1.5rem;
-    letter-spacing: 0;
-    font-weight: 600;
-    line-height: 1.3em;
-    border-radius: var(--border-radius);
-}
-
-.gh-nav-design .gh-nav-menu-title:hover {
-    background: none !important;
-}
-
-.gh-nav-design-tab {
-    display: flex;
-    flex-grow: 1;
-    position: relative;
-    align-items: center;
-    box-sizing: border-box;
-    padding: 7px var(--main-layout-area-padding);
-    color: var(--darkgrey-l1);
-    font-weight: 400;
-    font-size: 1.45rem;
-    transition: none;
-}
-
-.gh-nav-design-tab:hover {
-    color: var(--black);
-}
-
-.gh-nav-design-tab.active {
-    color: var(--black);
-    font-weight: 400;
-    border-radius: var(--border-radius) var(--border-radius) 0 0;
-}
-
-.gh-nav-bottom .gh-nav-design-tab {
-    justify-content: space-between;
-}
-
-.gh-nav-bottom .gh-nav-design-tab span {
-    display: flex;
-    align-items: center;
-    color: var(--black);
-    font-size: 1.5rem;
-    letter-spacing: 0;
-    font-weight: 600;
-}
-
-.gh-nav-design-tab:not(.active):hover {
-    background: var(--mainmenu-color-hover-bg);
-}
-
-.gh-nav-bottom .gh-nav-design-tab > a {
-    position: absolute;
-    inset: 0;
-}
-
-.gh-nav-bottom .gh-nav-design-tab .active-theme {
-    color: var(--midgrey);
-    font-size: 1.3rem;
-    font-weight: 400;
-}
-
-.gh-nav-design .gh-nav-list {
-    display: flex;
-    flex-direction: column;
-}
-
-.gh-nav-design .gh-nav-list .active svg {
-    fill: none;
-}
-
-.gh-nav-design .gh-nav-button-expand {
-    position: relative;
-    top: inherit;
-    left: inherit;
-    margin: 0 8px 0 auto;
-    padding-top: 3px;
-}
-
-.gh-nav-design .gh-nav-button-expand svg {
-    margin-right: 0;
-}
-
-.gh-nav-design .gh-nav-bottom {
-    position: sticky;
-    -webkit-position: sticky;
-    bottom: -24px;
-    z-index: 9997;
-    height: 120px;
-    padding: 0;
-    -webkit-backface-visibility: hidden;
-}
-
-.gh-nav-design .gh-nav-bottom::before,
-.gh-nav-design .gh-nav-bottom::after {
-  content: "";
-  position: sticky;
-  -webkit-position: sticky;
-  display: block;
-  height: 24px;
-}
-
-.gh-nav-design .gh-nav-bottom::before {
-    z-index: 9998;
-    bottom: 0;
-    background: var(--white);
-}
-
-.gh-nav-design .gh-nav-bottom::after {
-    bottom: 72px;
-    box-shadow: 0 0 0 1px rgba(0,0,0,.04), 0 -8px 16px -3px rgba(0,0,0,.15);
-}
-
-.gh-change-theme {
-    position: sticky;
-    -webkit-position: sticky;
-    bottom: 0;
-    z-index: 9999;
-    display: flex;
-    align-items: center;
-    height: 96px;
-    margin-bottom: -24px;
-    background: var(--white);
-}
-
-.gh-theme-docs {
-    position: relative;
-    z-index: 10;
-    padding: 4px 8px;
-    line-height: 0;
-    color: var(--midgrey);
-}
-
-.gh-theme-docs:hover {
-    color: #15171a;
-}
-
-.gh-theme-docs svg {
-    width: 12px;
-    height: 12px;
-    fill: currentColor;
-}
-
-.gh-nav-design-tabicon {
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    width: 40px;
-    height: 40px;
-    margin-right: -8px;
-    border-radius: 50%;
-}
-
-.gh-nav-design-tab.active .gh-nav-design-tabicon {
-    background: var(--mainmenu-color-hover-bg);
-}
-
-.gh-nav-design-tabicon svg {
-    width: 18px;
-    height: 18px;
-    fill: currentColor;
-}
-
-.gh-nav-design-settings {
-    margin: 8px 0 24px;
-    padding: 24px var(--main-layout-area-padding) 16px;
-    background: var(--mainmenu-color-hover-bg);
-}
-
-.gh-nav-design .gh-setting {
-    padding: 16px 0;
-}
-
-.gh-nav-design .gh-setting-first {
-    padding-bottom: 16px;
-}
-
-.gh-nav-design .gh-setting-boolean + .gh-setting-boolean {
-    padding-top: 8px;
-}
-
-.gh-nav-design .gh-setting-title {
-    font-size: 1.3rem;
-    font-weight: 600;
-}
-
-.gh-nav-design .gh-setting-action {
-    align-self: flex-start;
-}
-
-.gh-nav-design .gh-select svg {
-    width: 12px;
-    height: 6px;
-    margin-right: 0;
-}
-
-.gh-nav-design .input-color input {
-    position: relative;
-    height: 30px;
-    width: 102px;
-    padding: 3px 4px 3px 44px;
-    font-size: 1.3rem;
-}
-
-.gh-nav-design .input-color::after {
-    top: 5px;
-    left: 34px;
-}
-
-.gh-nav-design .color-box-container {
-    height: 26px;
-    width: 26px;
-    position: absolute;
-    overflow: hidden;
-    top: 2px;
-    left: 2px;
-    border-top-left-radius: 2px;
-    border-bottom-left-radius: 2px;
-}
-
-.gh-nav-design .color-box-container .color-picker {
-    position: absolute;
-    top: -10px;
-    left: -10px;
-    border: none;
-    outline: none;
-    padding: 0;
-    margin: 0;
-    width: 50px;
-    height: 50px;
-}
-
-.gh-nav-design .gh-setting-action-largeimg-delete,
-.gh-nav-design .gh-setting-action-smallimg-delete {
-    position: absolute;
-    top: 5px;
-    right: 5px;
-    background: rgba(0, 0, 0, 0.9);
-    border: 1px solid rgba(255, 255, 255, 0.25);
-    padding: 5px;
-    margin: 0;
-    border-radius: 3px;
-    opacity: 0;
-}
-
-.gh-nav-design .gh-setting-action-largeimg-edit,
-.gh-nav-design .gh-setting-action-smallimg-edit {
-    right: 40px;
-}
-
-.gh-nav-design .gh-setting-action-largeimg-delete:hover,
-.gh-nav-design .gh-setting-action-smallimg-delete:hover {
-    background: var(--red);
-    border-color: transparent;
-}
-
-.gh-nav-design .gh-setting-action-smallimg-edit:hover,
-.gh-nav-design .gh-setting-action-largeimg-edit:hover {
-    background: var(--middarkgrey);
-}
-
-.gh-nav-design .gh-setting-action-largeimg-delete svg,
-.gh-nav-design .gh-setting-action-smallimg-delete svg {
-    margin: 0;
-}
-
-.gh-nav-design .for-switch label {
-    width: 34px !important;
-    height: 22px !important;
-    margin: 0;
-}
-
-.gh-nav-design .for-checkbox .input-toggle-component {
-    background-color: var(--white);
-}
-
-.gh-nav-design .kg-settings-panel-control-input {
-    margin-right: -4px;
-}
-
-.gh-nav-design .kg-settings-headerstyle-btn-group .kg-headerstyle-btn-light {
-    border-color: color-mod(var(--lightgrey) l(-5%) s(-10%));
-}
-
-.gh-design {
-    display: flex;
-    flex-direction: column;
-    height: 100%;
-}
-
-.gh-design.gh-canvas {
-    padding: 0 clamp(24px, 10.26vw + -116.1px, 48px);
-}
-
-.gh-preview-page-selector,
-.gh-preview-page-selector select {
-    height: 34px;
-    min-width: 160px;
-}
-
-.gh-preview-page-selector svg {
-    margin-top: -.1em;
-}
-
-.gh-design-preview-mode span {
-    line-height: 28px;
-}
-
-.gh-design-preview-mode svg {
-    max-width: 16px;
-    height: 16px;
-    vertical-align: middle;
-    fill: var(--midgrey);
-}
-
-.gh-design .view-container {
-    padding-bottom: 0;
-}
-
-.gh-design .gh-pe-mobile-container {
-    margin: 4vmin 0 4rem;
-}
-
-.gh-advanced svg {
-    width: auto;
-    height: 6px;
-    margin-right: .6em;
-    fill: var(--darkgrey);
-}
-
-.gh-advanced svg path {
-    stroke: var(--darkgrey);
-}
-
-.gh-themes-container {
-    margin-bottom: 40px;
-    background: var(--main-color-content-greybg);
-    border-radius: var(--border-radius);
-}
-
-.gh-themes-container .apps-grid-cell {
-    background: none;
-}
-
-.gh-themes-container .apps-grid-cell:hover {
-    background: var(--whitegrey-l1);
-}
-
-.gh-themes-container .apps-card-app {
-    padding: 16px 24px;
-}
-
-.gh-themes-container .apps-grid-cell:last-of-type .apps-card-app {
-    border-bottom: none;
-}
-
-.gh-themes-container .apps-configured-action {
-    display: block;
-    margin-right: 16px;
-    padding: 2px 6px;
-    color: var(--green-d1);
-    border-radius: var(--border-radius);
-}
-
-.gh-themes-container .gh-btn-icon {
-    background: none;
-}
-
-.gh-themes-container .gh-btn-icon:hover {
-    background: var(--whitegrey-d1);
-}
-
-.gh-themes-container .gh-btn-icon svg {
-    margin-right: 0;
-}
-
-.gh-list-delete {
-    color: var(--red-d1) !important;
-}
-
-@media (max-width: 500px) {
-    .gh-themes-container .apps-configured {
-        justify-content: flex-end;
-    }
-    .gh-themes-container .apps-card-meta {
-        flex-basis: auto;
-    }
-}
-
-.gh-theme-directory-container {
-    padding: 8px 0 0;
-}
-
-.theme-directory {
-    display: grid;
-    justify-content: space-between;
-    grid-template-columns: 1fr 1fr 1fr;
-    grid-column-gap: 40px;
-    grid-row-gap: 64px;
-    margin: 0 0 24px;
-}
-
-@media (min-width: 1800px) {
-    .theme-directory {
-        grid-template-columns: 1fr 1fr 1fr 1fr;
-    }
-}
-
-@media (max-width: 1120px) {
-    .theme-directory {
-        grid-template-columns: 1fr 1fr;
-    }
-}
-
-@media (min-width: 800px) and (max-width: 890px) {
-    .theme-directory {
-        grid-template-columns: 1fr;
-    }
-}
-
-@media (max-width: 800px) {
-    .theme-directory {
-        grid-column-gap: 32px;
-        grid-row-gap: 48px;
-    }
-}
-
-@media (max-width: 430px) {
-    .theme-directory {
-        grid-template-columns: 1fr;
-    }
-}
-
-.gh-theme-browser {
-    position: relative;
-    width: 100%;
-    height: 28px;
-    padding: 0 12px;
-    background: var(--whitegrey-l1);
-    border-radius: 3px 3px 0 0;
-}
-
-.gh-theme-browser-button {
-    position: relative;
-    top: 11px;
-    display: block;
-    width: 6px;
-    height: 6px;
-    background: var(--lightgrey);
-    border-radius: 50%;
-}
-
-.gh-theme-browser-button::before,
-.gh-theme-browser-button::after {
-    content: "";
-    position: absolute;
-    width: 6px;
-    height: 6px;
-    background: var(--lightgrey);
-    border-radius: 50%;
-}
-
-.gh-theme-browser-button::before {
-    left: 12px;
-}
-
-.gh-theme-browser-button::after {
-    left: 24px;
-}
-
-.td-item-labs {
-    text-align: left !important;
-}
-
-.td-item-screenshot-labs {
-    line-height: 0;
-    border-radius: 0 0 3px 3px;
-}
-
-.td-item-screenshot-labs img {
-    border-radius: 0 0 3px 3px;
-}
-
-.theme-directory .td-item-desc {
-    display: flex;
-    flex-direction: column;
-}
-
-.td-item-name {
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    margin-bottom: 4px;
-    font-size: 1.6rem;
-    text-transform: none;
-}
-
-.td-item-labs .td-item-category {
-    margin-left: 0;
-    color: var(--midgrey);
-    font-size: 1.2rem;
-    font-weight: 500;
-    text-transform: uppercase;
-}
-
-.gh-theme-directory-footer {
-    position: relative;
-    padding: 58px var(--main-layout-content-sidepadding);
-    color: var(--whitegrey-l2);
-    font-size: 1.75rem;
-    text-align: center;
-    background: #15171A;
-    background-repeat: no-repeat;
-    background-position: 100% 50%;
-    background-size: 35vw;
-}
-
-.gh-theme-directory-footer .link {
-    color: var(--lime);
-    font-weight: 500;
-}
-
-.gh-theme-preview {
-    max-width: none;
-    padding: 0 80px 48px;
-}
-
-.gh-theme-preview .view-container {
-    padding-bottom: 0;
-}
-
-.gh-theme-preview .gh-pe-mobile-container {
-    margin-top: 4vmin;
-}
-
-/* Membership */
-.gh-setting-membership {
-    margin-bottom: 32px;
-}
-
-@media (max-width: 1140px) {
-    .gh-setting-members-canvas::before {
-        display: none;
-    }
-}
-
-.gh-setting-members-basicsform {
-    display: flex;
-    flex-direction: column;
-    justify-content: space-between;
-}
-
-.gh-setting-members-basicsform .intro {
-    margin: 0;
-    font-size: 1.6rem;
-    margin-bottom: 12px;
-}
-
-.gh-setting-members-portalcta {
-    background: linear-gradient(to left, color-mod(var(--main-color-content-greybg) l(-3%)), var(--main-color-content-greybg));
-}
-
-.gh-setting-members-portalcta .gh-expandable-header button {
-    margin-left: 16px;
-}
-
-@media (max-width: 500px), (min-width: 1140px) and (max-width: 1260px) {
-    .gh-setting-members-portalcta .gh-expandable-header {
-        flex-direction: column;
-        align-items: inherit;
-    }
-
-    .gh-setting-members-portalcta .gh-expandable-header button {
-        margin-top: 1rem;
-        margin-left: 0;
-    }
-}
-
-.gh-setting-members-portalcta .gh-expandable-description {
-    padding-top: 2px;
-    line-height: 1.4;
-}
-
-.gh-setting-members-portalpreview {
-    justify-self: end;
-    font-size: 1.3rem;
-    font-weight: 500;
-    color: var(--midgrey);
-}
-
-@media (max-width: 1140px) {
-    .gh-setting-members-portalpreview {
-        display: none;
-    }
-}
-
-.gh-setting-dropdown {
-    margin-top: 1.2rem;
-    cursor: pointer;
-    background: var(--white);
-}
-
-.gh-setting-dropdown[aria-disabled="true"] {
-    background: var(--whitegrey-l2);
-}
-
-.gh-setting-dropdown[aria-disabled="true"] svg path {
-    fill: var(--lightgrey-d1);
-}
-
-.gh-setting-dropdown[aria-disabled="true"] .gh-radio-label {
-    opacity: .65;
-}
-
-.gh-setting-dropdown:focus-visible {
-    outline: none;
-}
-
-.gh-setting-dropdown .ember-power-select-status-icon {
-    right: 24px;
-}
-
-.gh-setting-dropdown .gh-setting-dropdown-content {
-    display: flex;
-    align-items: center;
-    margin: 1.2rem 2.4rem 1.2rem 0.8rem;
-}
-
-.gh-setting-dropdown-list {
-    margin-top: -1px;
-    border-top: 1px solid var(--input-border-color) !important;
-}
-
-.gh-setting-dropdown-list .ember-power-select-option {
-    padding: 6px 8px;
-}
-
-.gh-setting-dropdown-list .gh-setting-dropdown-content {
-    display: flex;
-    align-items: center;
-    margin: 1.4rem 1rem;
-}
-
-.gh-setting-dropdown-content svg {
-    width: 3rem;
-    height: 3rem;
-    margin-right: 1.2rem;
-}
-
-.gh-setting-richdd-container {
-    margin: 36px 0 0;
-}
-
-.gh-expandable-content .gh-setting-richdd-container {
-    margin: 0 0 30px;
-}
-
-.gh-expandable-content .gh-setting-richdd-container .gh-setting-dropdown {
-    margin-top: 0;
-}
-
-.gh-setting-large-dropdown .ember-power-select-multiple-trigger {
-    padding: 8px;
-}
-
-.gh-setting-large-dropdown .segment-totals {
-    display: none;
-}
-
-.gh-setting-rich-dropdown {
-    margin-bottom: 32px;
-}
-
-.gh-setting-rich-dropdown .ember-power-select-status-icon {
-    right: 20px;
-}
-
-.gh-setting-members-tierscontainer {
-    margin-top: 4vmin;
-}
-
-.gh-settings-members-tiersheader {
-    display: flex;
-    align-items: flex-end;
-    justify-content: space-between;
-}
-
-.gh-settings-members-tiersheader .gh-btn-stripe-status {
-    margin-bottom: 12px;
-}
-
-.gh-settings-members-tiersheader .gh-btn-stripe-status span {
-    height: 28px;
-    line-height: 28px;
-    font-size: 1.25rem;
-}
-
-.gh-stripe-connect-link {
-    color:#635bff;
-    font-weight:500;
-}
-
-.gh-setting-members-portal-mock {
-    display: flex;
-    position: relative;
-    align-items: center;
-    justify-content: center;
-    background: #fff;
-    box-shadow: var(--box-shadow-preview-box);
-    width: 420px;
-    height: 562px;
-    margin-bottom: 32px;
-    border-radius: 5px;
-    pointer-events: none;
-    transition: height 0.17s ease-out;
-}
-
-.gh-setting-members-portal-mock.mock-enabled {
-    pointer-events: unset;
-}
-
-.gh-setting-members-portal-disabled {
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    margin: 32px;
-    text-align: center;
-}
-
-.gh-setting-members-portal-disabled svg {
-    width: 44px;
-    height: 44px;
-}
-
-.gh-setting-members-portal-disabled svg path {
-    stroke-width: 1.2px;
-}
-
-.gh-setting-members-portal-disabled h4 {
-    font-size: 1.5rem;
-    letter-spacing: 0;
-    font-weight: 500;
-    color: var(--darkgrey);
-}
-
-.gh-setting-members-portal-disabled p {
-    max-width: 240px;
-    font-weight: 400;
-}
-
-.gh-setting-members-portal-mock .site-frame {
-    border-radius: 5px;
-}
-
-.gh-settings-members-pricetrialcont {
-    display: grid;
-    grid-template-columns: 1fr 1fr;
-    grid-gap: 32px;
-}
-
-.gh-settings-members-pricetrialcont .trial-docs-link {
-    color: #30cf43;
-    white-space: nowrap;
-}
-
-.gh-settings-members-pricelabelcont {
-    display: flex;
-    align-items: baseline;
-}
-
-.gh-settings-members-pricelabelcont.free-trial-enabled {
-    justify-content: space-between;
-    margin-bottom: 3px;
-}
-
-.gh-settings-members-pricelabelcont span {
-    margin: 0 4px;
-}
-
-.gh-settings-members-pricelabelcont span,
-.gh-settings-members-pricelabelcont div {
-    display: inline-block;
-    margin-bottom: 3px;
-}
-
-.gh-settings-members-pricelabelcont .gh-select svg {
-    position: unset;
-    margin-top: -3px;
-}
-
-.gh-settings-members-pricelabelcont .gh-select {
-    padding: 0;
-    height: 16px;
-    border: none;
-    margin-left: 0;
-    margin-right: 0;
-}
-
-.gh-settings-members-pricelabelcont .gh-select select {
-    font-size: 1.4rem;
-    font-weight: 500;
-    border: none;
-    height: 16px;
-    width: 46px;
-    padding: 0;
-}
-
-.gh-setting-members-prices {
-    display: grid;
-    grid-template-columns: 1fr 1fr;
-    grid-gap: 20px;
-}
-
-.gh-setting-members-prices.free-trial-enabled {
-    display: grid;
-    grid-template-rows: 1fr 1fr;
-    grid-template-columns: none !important;
-    grid-gap: 6px;
-}
-
-.gh-setting-members-currency {
-    position: relative;
-}
-
-.gh-setting-members-currencylabel {
-    position: absolute;
-    display: flex !important;
-    align-items: center;
-    top: 0px;
-    left: 0px;
-    background: var(--main-color-content-greybg);
-    height: 20px;
-    font-weight: 500;
-    font-size: 1.3rem;
-    color: var(--middarkgrey);
-    text-transform: uppercase;
-    pointer-events: none;
-    min-width: 60px;
-}
-
-.gh-setting-members-currencylabel span {
-    margin-right: 0;
-    pointer-events: none;
-    padding-right: 3px;
-}
-
-.gh-input-group-tier-trial-disabled .gh-input-append {
-    border-color: #eceef0;
-    background-color: #fcfcfc;
-}
-
-.gh-input-group-tier-trial-disabled .gh-input-append:before {
-    background-color: #fcfcfc;
-}
-
-/* Stripe Connect modal */
-.fullscreen-modal-stripe-connect {
-    max-width: 860px;
-}
-
-.fullscreen-modal-stripe-connect:not(.fullscreen-modal-stripe-connected) .gh-main-section {
-    margin: 0 0 -32px;
-}
-
-.fullscreen-modal-stripe-connect:not(.fullscreen-modal-stripe-connected) .gh-btn-stripe-disconnect,
-.fullscreen-modal-stripe-connect:not(.fullscreen-modal-stripe-connected) .gh-stripe-guide-container {
-    display: none;
-}
-
-.fullscreen-modal-stripe-connect.fullscreen-modal-stripe-connected .modal-header {
-    display: none;
-}
-
-.fullscreen-modal-stripe-connected .modal-content {
-    background: linear-gradient(to top, #F6F6F6, #ffffff);
-    border-radius: 12px;
-}
-
-.fullscreen-modal-stripe-connected .gh-main-section {
-    margin-bottom: 0;
-}
-
-.gh-members-stripe-info-header {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-}
-
-.gh-members-stripe-info-header h4 {
-    font-weight: 600;
-    margin: 0;
-    padding: 0;
-    color: #555ABF;
-}
-
-.gh-members-stripe-info {
-    border-radius: 0.9rem;
-    background: color-mod(#555ABF a(12%));
-    padding: 12px;
-    width: 380px;
-    color: #555ABF;
-}
-
-.gh-members-stripe-badge {
-    width: 180px;
-}
-
-.gh-members-stripe-link,
-.gh-members-stripe-link:hover {
-    color: #555ABF;
-    text-decoration: underline;
-}
-
-.gh-members-connectbutton-container {
-    margin-right: 4px;
-}
-
-.gh-members-connectbutton-container .for-switch {
-    line-height: 1em;
-}
-
-.gh-members-connectbutton-container .for-switch label {
-    width: 36px !important
-}
-
-.gh-members-connectbutton-container .for-switch input:checked + .input-toggle-component {
-    background: #F1946A;
-}
-
-.gh-members-connect-testmodeon {
-    color: #F1946A;
-}
-
-.gh-members-stripe-connect-token {
-    background: var(--whitegrey-l2);
-    min-height: unset;
-    height: 80px;
-    font-family: var(--font-family-mono);
-    font-size: 1.3rem;
-    resize: none;
-}
-
-.gh-members-connect-testmodelabel {
-    display: inline-block;
-    background: #f8e5b9;
-    color: #983705;
-    font-size: 1.3rem;
-    font-weight: 500;
-    line-height: 1em;
-    border-radius: 999px;
-    padding: 4px 8px;
-}
-
-.gh-members-connect-savecontainer {
-    height: 0px;
-    overflow-y: hidden;
-    transition: all 0.2s ease-in-out;
-    opacity: 0;
-    margin-top: 16px;
-    margin-bottom: 0;
-}
-
-.gh-members-connect-savecontainer.expanded {
-    margin-bottom: 20px;
-}
-
-.gh-members-connect-savecontainer.expanded {
-    height: 36px;
-    opacity: 1.0;
-}
-
-.gh-stripe-connected-container {
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    margin-top: 7vw;
-}
-
-.gh-stripe-connected-container h1 {
-    font-size: 2.6rem;
-    font-weight: 600;
-    text-align: center;
-    letter-spacing: -.5px;
-    margin: 20px 0 10px;
-}
-
-.gh-stripe-connected-info {
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    text-align: center;
-    margin-bottom: 5vw;
-}
-
-.gh-stripe-site-title {
-    display: flex;
-    justify-content: center;
-    align-items: center;
-}
-
-.gh-stripe-connected-info p {
-    margin: 0 10px 0 0;
-    font-size: 1.5rem;
-    letter-spacing: -.1px;
-}
-
-.gh-btn-stripe-disconnect {
-    position: absolute;
-    top: 0;
-    left: 0;
-    z-index: 9999;
-    margin: 0;
-}
-
-.fullscreen-modal-stripe-connect .modal-content .close {
-    top: 32px;
-    right: 32px;
-}
-
-.gh-stripe-error-hasactivesub {
-    margin: 24px 24px -8px;
-    color: var(--red);
-}
-
-.gh-stripe-guide-container {
-    display: flex;
-    flex-direction: column;
-    justify-content: center;
-    align-items: center;
-    width: 100%;
-}
-
-.gh-stripe-guide-container > p {
-    text-transform: uppercase;
-    letter-spacing: .1em;
-    font-weight: 500;
-    margin-bottom: 20px;
-}
-
-.gh-logos-stripe-connect {
-    display: flex;
-}
-
-.gh-logo-squircle {
-    flex: 0 0 60px;
-    width: 60px;
-    height: 60px;
-    background-position: center center;
-    background-size: cover;
-    background-repeat: no-repeat;
-    border-radius: 35%;
-}
-
-.gh-logo-squircle:first-of-type {
-    z-index: 101;
-}
-
-.gh-logo-squircle:nth-of-type(2) {
-    z-index: 102;
-    box-shadow: -1.5px 0 0 1.5px #fff;
-    margin-left: -3px;
-}
-
-.gh-stripe-guide {
-    display: flex;
-    width: 100%;
-    box-shadow: rgba(0,0,0,0.05) 0 14px 23px -18px;
-    color: var(--midgrey);
-    transition: all 0.2s ease-in-out;
-}
-
-.gh-stripe-guide:hover {
-    box-shadow: rgba(0,0,0,0.1) 0 14px 23px -18px;
-}
-
-.gh-stripe-guide-content {
-    display: flex;
-    flex-direction: column;
-    flex-grow: 1;
-    flex-basis: 100%;
-    padding: 20px;
-    overflow: hidden;
-    background-color: var(--white);
-    border-top: 1px;
-    border-bottom: 1px;
-    border-left: 1px;
-    border-right: 0;
-    border-style: solid;
-    border-color: var(--lightgrey-l2);
-    border-radius: 2px 0 0 2px;
-}
-
-.gh-stripe-guide-content-body {
-    display: flex;
-    flex-direction: column;
-}
-
-.gh-stripe-guide-content-body h3 {
-    font-size: 1.7rem;
-    font-weight: 600;
-}
-
-.gh-stripe-guide-content-body p {
-    font-size: 1.4rem;
-}
-
-.gh-stripe-guide-content-footer {
-    display: flex;
-    align-items: center;
-}
-
-.gh-stripe-guide-content-footer svg {
-    width: 20px;
-    height: 20px;
-    flex: 0 0 20px;
-}
-
-.gh-stripe-guide-content-footer h4,
-.gh-stripe-guide-content-footer p {
-    margin: 0;
-}
-
-.gh-stripe-guide-content-footer h4 {
-    font-size: 1.4rem;
-    font-weight: 500;
-    margin-left: 5px;
-    margin-right: 6px;
-    letter-spacing: -0.02em;
-}
-
-.gh-stripe-guide-content-footer p {
-    font-weight: 500;
-    color: #15171a;
-}
-
-.gh-stripe-guide-content-footer span {
-    margin-right: 6px;
-    font-size: 3.2rem;
-    color: var(--black);
-    line-height: .8em;
-}
-
-.gh-stripe-guide-image {
-    position: relative;
-    flex-grow: 1;
-    min-width: 33%;
-    align-items: center;
-}
-
-.gh-stripe-guide-image img {
-    width: 100%;
-    height: 100%;
-    object-fit: cover;
-    position: absolute;
-    top: 0;
-    left: 0;
-    border-radius: 0 2px 2px 0;
-}
-
-@media (max-width: 1080px) {
-    .gh-settings-members-pricetrialcont {
-        display: grid;
-        grid-template-columns: none;
-        grid-gap: 0px;
-        margin-bottom: 24px;
-    }
-}
-
-@media (max-width: 500px) {
-    .gh-members-stripe-info-header {
-        flex-direction: column;
-        align-items: stretch;
-    }
-
-    .gh-members-stripe-info-header h4 {
-        order: 2;
-        margin-top: 10px;
-        padding-top: 10px;
-        border-top: 1px solid var(--whitegrey);
-    }
-
-    .gh-members-stripe-badge {
-        order: 1;
-        /* margin: -10px 0 0 -10px; */
-    }
-
-    .gh-members-stripe-info {
-        width: 100%;
-    }
-
-    .gh-stripe-connected-container {
-        margin-top: 7rem;
-    }
-
-    .gh-stripe-connected-container h1 {
-        font-size: 2.4rem;
-    }
-
-    .gh-stripe-connected-info p {
-        font-size: 1.4rem;
-    }
-
-    .gh-stripe-guide-image {
-        display: none;
-    }
-
-    .gh-stripe-guide-content {
-        border-radius: 2px;
-        border: 1px solid var(--lightgrey-l2);
-    }
-}
-
-@media (max-width: 430px) {
-    .gh-stripe-site-title {
-        flex-direction: column;
-    }
-    .gh-members-connect-testmodelabel {
-        margin-top: 15px;
-    }
-    .gh-logo-squircle {
-        flex-basis: 40px;
-        width: 40px;
-        height: 40px;
-    }
-}
-
-.gh-setting-nossl {
-    border-top: 1px solid var(--whitegrey-d1);
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    margin: 16px -24px -12px;
-}
-
-.gh-setting-nossl-container {
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    padding: 32px;
-    text-align: center;
-    max-width: 520px;
-}
-
-.gh-setting-nossl-container svg {
-    width: 44px;
-    height: 44px;
-    margin-bottom: 12px;
-}
-
-.gh-setting-nossl-container svg path,
-.gh-setting-nossl-container svg rect,
-.gh-setting-nossl-container svg circle {
-    stroke-width: 1px;
-}
-
-.gh-setting-nossl-container h4 {
-    font-size: 1.5rem;
-    letter-spacing: 0;
-    font-weight: 600;
-}
-
-.gh-setting-nossl-container p {
-    margin: 8px 0 0;
-    color: var(--midgrey);
-}
-
-/* Signup form modal */
-.gh-signup-form-embed {
-    margin: 6vw 0;
-}
-
-.fullwidth-modal {
-    max-width: 100%;
-}
-
-.epm-modal .modal-signup-form-embed {
-    display: grid;
-    grid-template-columns: 5fr 3fr;
-    max-width: 1120px;
-    max-height: 520px;
-    margin: 32px;
-    padding: 0;
-}
-
-@media (max-width: 960px) {
-    .epm-modal .modal-signup-form-embed {
-        grid-template-columns: 1fr;
-    }
-}
-
-.modal-signup-form-embed-preview {
-    position: relative;
-    margin: 1.6rem;
-    margin-right: 0;
-    overflow: hidden;
-    border: 1px solid var(--whitegrey);
-}
-
-@media (max-width: 960px) {
-    .modal-signup-form-embed-preview {
-        display: none;
-    }
-}
-
-.gh-signup-form-iframe {
-    position: absolute;
-    top: 0;
-    left: 0;
-    height: 100%;
-    width: 100%;
-    border: 0;
-    opacity: 1;
-    z-index: 0;
-    transition: none;
-}
-
-.gh-signup-form-iframe.gh-iframe-hidden {
-    opacity: 0;
-    z-index: 1;
-    transition: 0.3s opacity;
-    pointer-events: none;
-}
-
-.modal-signup-form-embed-main {
-    padding: 32px;
-    height: 100%;
-}
-
-.modal-signup-form-embed-main .modal-body {
-    height: 320px;
-    margin: 0 -32px;
-    padding: 0 32px;
-    overflow-y: auto;
-}
-
-.modal-signup-form-embed-main .form-group {
-    margin-bottom: 0;
-}
-
-.gh-signup-form-container .gh-stack-item {
-    margin-bottom: 1.6rem;
-}
-
-.gh-signup-form-container .gh-stack-item:last-child {
-    margin-bottom: 0;
-}
-
-.gh-signup-form-embed-code-input {
-    min-height: 72px;
-    background: var(--whitegrey-l2);
-    font-family: var(--font-family-mono);
-    font-size: 1.35rem;
-}
-
-.gh-signup-form-embed-code-input:focus {
-    background: var(--whitegrey-l2);
-    border-color: var(--lightgrey-l1) !important;
-    box-shadow: none;
-}
-
-/* Tips & donations
-/* ---------------------------------------------------------- */
-.gh-tips-and-donations-suggested-amount {
-    max-width: 200px;
-    margin-right: 24px;
-}
-
-.gh-tips-and-donations-suggested-amount .gh-input {
-    border-top-right-radius: 0;
-    border-bottom-right-radius: 0;
-}
-
-.gh-tips-and-donations-currency {
-    width: 120px;
-}
-
-.gh-tips-and-donations-currency select {
-    border-top-left-radius: 0;
-    border-bottom-left-radius: 0;
-    border-left: none !important;
-}
-
-.gh-tips-and-donations-link-container {
-    position: relative;
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    font-size: 1.4rem;
-    height: 38px;
-    background: var(--whitegrey-l2);
-    border-radius: 4px;
-    border: 1px solid var(--whitegrey);
-    color: var(--darkgrey);
-    font-weight: 500;
-    width: 100%;
-}
-
-/* History log
-/* ---------------------------------------------------------- */
-.gh-history-filter-li {
-    height: 32px;
-}
-
-.gh-history-filter-li svg {
-    margin-right: 6px;
-}
-
-.gh-activity-log-actions {
-    padding-top: 12px;
-    padding-bottom: 12px;
-}
-
-.gh-activity-log-actions ul {
-    width: 240px;
-}
-
-.gh-activity-log-actions hr {
-    margin: 12px -20px;
-}
-
-.gh-activity-log-action-switch.for-switch.small label {
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    width: unset !important;
-    height: unset !important;
-}
-
-.gh-activity-log-action-switch.for-switch.small .input-toggle-component {
-    position: relative;
-    width: 30px!important;
-    height: 18px!important;
-}
-
-.gh-activity-log-action-switch.for-switch.small .input-toggle-component:before {
-    width: 14px !important;
-    height: 14px !important;
-}
-
-.gh-activity-log-action-switch.for-switch.small input:checked+.input-toggle-component:before {
-    transform: translateX(12px);
-}
-
-.gh-history-container {
-    display: flex;
-    align-items: center;
-}
-
-.gh-history-container strong {
-    font-weight: 600;
-}
-
-.gh-history-action {
-    padding-right: 6px;
-}
-
-.gh-history-object {
-    padding-left: 6px;
-}
-
-.gh-history-object code {
-    background: none;
-    border: none;
-    color: var(--midgrey);
-}
-
-.gh-history-dash {
-    padding-left: 0;
-    padding-right: 0;
-    color: var(--lightgrey);
-}
-
-.gh-history-description {
-    font-size: 1.4rem;
-    color: var(--darkgrey);
-    white-space: nowrap;
-    margin-top: 2px;
-}
-
-.gh-history-description a {
-    font-weight: 700;
-}
-
-.gh-history-name {
-    font-size: 1.35rem;
-    font-weight: 400;
-    margin-bottom: 0 !important;
-    color: var(--midgrey);
-}
-
-.gh-history-name a {
-    color: var(--midgrey) !important;
-    font-weight: 400;
-}
-
-.gh-history-name a:hover {
-    color: var(--darkgrey) !important;
-}
-
-.gh-history-datetime {
-    font-size: 1.2rem;
-    color: var(--midlightgrey);
-}
-
-.gh-history-table .user-list-item-figure {
-    position: relative;
-    height: 34px;
-    width: 34px;
-    margin-left: 0;
-    margin-right: 16px;
-}
-
-.gh-history-icon {
-    position: absolute;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    right: -7px;
-    bottom: -7px;
-    background: var(--white);
-    width: 22px;
-    height: 22px;
-    color: var(--midgrey);
-    border-radius: 999px;
-    box-shadow: 0px 2px 3px rgba(0, 0, 0, 0.12);
-}
-
-.gh-history-icon svg {
-    width: 12px;
-    height: 12px;
-}
-
-@media (max-width: 620px) {
-    .gh-history-table .user-list-item-figure {
-        display: none;
-    }
-
-    .gh-history-name {
-        font-size: 1.4rem !important;
-        min-width: 130px;
-    }
-}
-
-/* About /ghost/settings/about/
-/* ---------------------------------------------------------- */
-.gh-about-logo svg {
-    position: relative;
-    width: 120px;
-    height: auto;
-}
-
-.gh-about-logo {
-    border-bottom: 1px solid var(--lightgrey-l2);
-    padding-bottom: 10px;
-    margin-bottom: 16px;
-}
-
-.gh-about-modal .gh-about-logo {
-    margin: 4px 0 20px;
-    border-bottom: none;
-    padding-bottom: 0;
-}
-
-.gh-about-container {
-    display: grid;
-    grid-template-columns: 2fr 1fr;
-    grid-gap: 80px;
-}
-
-.gh-whats-new-canvas .gh-about-container {
-    display: flex;
-    grid-template-columns: unset;
-    grid-gap: unset;
-    margin: 0 auto;
-    max-width: 920px;
-    margin-top: 60px;
-}
-
-.gh-about-box {
-    position: sticky;
-    top: 96px;
-    right: 0;
-    display: flex;
-    flex-grow: 1;
-    flex-direction: column;
-    height: max-content;
-    border-radius: 3px;
-    min-width: 300px;
-}
-
-.gh-about-box.grey {
-    border: none;
-    background: var(--main-color-content-greybg);
-}
-
-.gh-env-details {
-    display: flex;
-    flex-grow: 1;
-    flex-direction: column;
-    padding: 24px 28px 28px;
-}
-
-.gh-about-container h2 {
-    font-size: 1.65rem;
-    line-height: 1.4em;
-    font-weight: 600;
-    border-bottom: 1px solid var(--lightgrey-l2);
-    padding-bottom: 12px;
-    margin-bottom: 12px;
-}
-
-.gh-env-list {
-    margin: 0;
-    padding: 0;
-    list-style: none;
-}
-
-.gh-env-list li {
-    margin: 0 0 4px;
-    font-size: 1.4rem;
-    line-height: 1.5em;
-}
-
-.gh-env-error {
-    margin: 1.2rem 0;
-    padding: 16px;
-    line-height: 1.4em;
-    border: none;
-    background: color-mod(var(--red) a(6%));
-    border-radius: 3px;
-}
-
-.gh-env-error a {
-    color: var(--red);
-}
-
-.gh-env-help {
-    max-width: 200px;
-}
-
-.gh-env-help .gh-btn {
-    margin: 4px 0;
-}
-
-@media (max-width: 670px) {
-    .gh-env-details {
-        flex-direction: column;
-    }
-    .gh-env-help {
-        margin: 1em 0;
-        max-width: none;
-    }
-    .gh-env-help .gh-btn {
-        display: inline-block;
-    }
-}
-
-.gh-about-content-actions {
-    display: none;
-}
-
-
-
-/* Upgrade
-/* ---------------------------------------------------------- */
-
-.gh-upgrade-notification {
-    padding-top: 1em;
-}
-
-.gh-upgrade-notification a {
-    text-decoration: underline;
-}
-
-.gh-about-modal .gh-upgrade-notification {
-    background: color-mod(var(--green) a(8%));
-    padding: 24px 28px 24px;
-    border-radius: 3px;
-    margin-bottom: 28px;
-}
-
-/* Copyright Info
-/* ---------------------------------------------------------- */
-
-.gh-copyright-info {
-    color: var(--midgrey);
-    font-size: 1.3rem;
-    border-top: 1px solid var(--lightgrey-l2);
-    padding-top: 16px;
-    margin-top: 16px;
-    line-height: 1.45em;
-}
-
-.gh-about-modal .gh-copyright-info {
-    margin: 4px 0 8px;
-    border-top: none;
-}
-
-
-/* Debug screen
-/* ---------------------------------------------------------- */
-.gh-email-debug .gh-post-analytics-header .gh-canvas-header-content {
-    border-bottom: none;
-    padding-bottom: 0;
-}
-
-.gh-email-debug-error {
-    display: flex;
-    margin-top: 20px;
-    padding: 12px 16px 12px 40px;
-}
-
-.gh-email-debug-error svg {
-    height: 20px !important;
-    margin-top: -2px;
-}
-
-.gh-email-debug-errortext {
-    flex-grow: 1;
-    margin-left: 4px;
-}
-
-.gh-email-debug-error h4 {
-    font-size: 1.5rem;
-    font-weight: 600;
-    margin: 0;
-    padding: 0;
-}
-
-.gh-email-debug-error button {
-    min-width: 80px;
-}
-
-.gh-email-debug-settingstab-icon {
-    width: 20px;
-    height: 20px;
-    margin-bottom: 11px;
-    margin-top: 2px;
-}
-
-.gh-email-debug-settingstab-icon svg path,
-.gh-email-debug-settingstab-icon svg circle {
-    stroke-width: 2;
-}
-
-.gh-email-debug .gh-list {
-    border-bottom: none;
-}
-
-.gh-email-debug .gh-list thead,
-.gh-email-debug .gh-list tbody {
-    width: 100%;
-}
-
-.gh-email-debug .gh-list tr:first-of-type .gh-list-data {
-    border-top: none;
-}
-
-.gh-email-debug .gh-list tr .gh-list-data:first-of-type {
-    padding-left: 0;
-}
-
-.gh-email-debug-col-member {
-    padding-left: 0;
-    width: 25%;
-}
-
-.gh-email-debug-member {
-    display: flex;
-    flex-wrap: nowrap;
-    align-items: center;
-}
-
-.gh-email-debug-failure {
-    display: flex;
-}
-
-.gh-email-debug-failure svg {
-    height: 16px;
-    width: 16px;
-    margin-right: 4px;
-}
-
-.gh-email-debug-failure-details {
-    display: flex;
-    flex-direction: column;
-    gap: 2px;
-    width: 100%;
-}
-
-.gh-email-debug-failure-codes {
-    display: flex;
-    gap: 20px;
-}
-
-.gh-email-debug-failure-code {
-    color: var(--midgrey);
-}
-
-.gh-email-debug-failure-code span {
-    color: var(--darkgrey);
-    font-weight: 500;
-}
-
-.gh-email-debug .gh-list-data {
-    height: 98px;
-}
-
-.gh-email-debug-permanent-failures .gh-list-data,
-.gh-email-debug-temporary-failures .gh-list-data {
-    height: 80px;
-}
-
-.gh-email-debug-batch-col-status span {
-    display: inline-block;
-    position: relative;
-    padding-left: 16px;
-    color: var(--midlightgrey);
-}
-
-.gh-email-debug-batch-col-status span::before {
-    display: block;
-    position: absolute;
-    content: "";
-    top: 6px;
-    left: 0;
-    width: 8px;
-    height: 8px;
-    border-radius: 999px;
-    background: var(--midlightgrey);
-}
-
-.gh-email-debug-batch-col-status .failed {
-    color: color-mod(var(--red) l(-2%));
-}
-
-.gh-email-debug-batch-col-status .failed::before {
-    background: var(--red);
-}
-
-.gh-email-debug-batch-col-status .submitting {
-    color: var(--blue);
-}
-
-.gh-email-debug-batch-col-status .submitting::before {
-    background: var(--blue);
-}
-
-.gh-email-debug-batch-col-status .submitted {
-    color: var(--green);
-}
-
-.gh-email-debug-batch-col-status .submitted::before {
-    background: var(--green);
-}
-
-.gh-email-debug-batch-col-created,
-.gh-email-debug-batch-col-details {
-    color: var(--midgrey);
-}
-
-.gh-email-debug-batch-col-created span,
-.gh-email-debug-batch-col-segment span {
-    white-space: nowrap;
-}
-
-.gh-email-debug-batch-col-details .detailtext div {
-    word-break: break-all;
-}
-
-.gh-email-debug-batch-col-details .detailtext .noselect {
-    user-select: none;
-}
-
-.gh-email-debug-batch-col-details .detailtext div code {
-    white-space: unset;
-    word-break: normal;
-    user-select: text;
-}
-
-.gh-email-debug-batch-col-details .error {
-    color: color-mod(var(--red) l(-2%));
-    font-weight: unset;
-}
-
-.gh-email-debug-batch-col-segment span {
-    display: inline-block;
-    border-radius: 2px;
-    background: color-mod(var(--black) a(5%));
-    padding: 1px 6px;
-    color: var(--middarkgrey);
-}
-
-.gh-email-debug-batch-col-details span {
-    color: var(--darkgrey);
-    font-weight: 500;
-}
-
-.gh-email-debug-batch-col-details .download-icon {
-    width: 20px;
-    height: 20px;
-    margin-left: 20px;
-}
-
-.gh-email-debug-batch-col-details .download-icon path {
-    stroke: var(--midgrey);
-}
-
-.gh-email-debug-batch-col-details .detailtext {
-    flex-grow: 1;
-}
-
-.gh-email-debug-settings {
-    font-size: 1.3rem;
-    margin: 12px 0 20px;
-}
-
-.gh-email-debug-settings .gh-type-number {
-    font-variant-numeric: tabular-nums;
-}
-
-.gh-email-debug-settings hr {
-    margin: 8px 0;
-    border-top-color: var(--whitegrey);
-}
-
-.gh-email-debug-settings tr td {
-    font-weight: 500;
-    padding: 6px 0;
-}
-
-.gh-email-debug-settings tr td:first-of-type {
-    width: 30%;
-    white-space: nowrap;
-    color: var(--midgrey);
-}
-
-.gh-email-debug-settings-icon svg {
-    width: 14px;
-    height: 14px;
-}
-
-.gh-email-debug-settings-icon .check {
-    width: 18px;
-    height: 18px;
-}
-
-.gh-email-debug-settings-icon .check path {
-    stroke: var(--green);
-    stroke-width: 2.5;
-}
-
-.gh-email-debug-settings-icon .x path {
-    stroke: var(--midgrey);
-}
-
-.gh-email-debug-schedule-analytics {
-    display: flex;
-    align-items: center;
-    width: max-content;
-    margin: .8rem 0 0;
-    color: var(--green-d1);
-}
-
-.gh-email-debug-schedule-analytics svg {
-    width: 1rem;
-    height: 1rem;
-    margin-right: 6px;
-}
-
-.gh-email-debug-schedule-analytics svg g {
-    stroke: var(--green-d1);
-    stroke-width: 3px;
-}
-
-.gh-email-debug-empty-list {
-    margin: 120px 40px;
-    text-align: center;
-    font-size: 1.3rem;
-    color: var(--midgrey);
-}
-
-.gh-email-debug-readmore-error {
-    display: inline-flex;
-    width: 100%;
-}
-
-.gh-email-debug-readmore-error label {
-    order: 3;
-    cursor: pointer;
-}
-
-.gh-email-debug-readmore-error .toggle-checkbox {
-    display: none;
-}
-
-.gh-email-debug-readmore-error span {
-    display: -webkit-box;
-    -webkit-box-orient: vertical;
-    -webkit-line-clamp: 1;
-    overflow: hidden;
-    color: color-mod(var(--red) l(-2%));
-    word-break: break-all;
-}
-
-.gh-email-debug-readmore-error .toggle-checkbox:checked ~ span {
-    display: block;
-    -webkit-box-orient: unset;
-    -webkit-line-clamp: unset;
-    overflow: unset;
-    word-break: break-word;
-}
-
-.gh-email-debug-readmore-error .toggle-checkbox:checked ~ label {
-    display: none !important;
-}
-
-.gh-email-debug-readmore-error svg {
-    width: 12px;
-    height: 12px;
-    margin: 0;
-}
-
-.gh-email-debug-readmore-error svg circle {
-    fill: var(--midgrey);
-}
-
-.gh-email-debug-readmore-error label {
-    display: flex;
-    align-items: center;
-    padding: 0 4px;
-    border-radius: 2px;
-    height: 14px;
-    margin-top: 3px;
-    margin-left: 8px;
-    background: var(--whitegrey);
-}
-
-/* Announcement bar */
-
-.gh-announcement-editor {
-    min-height: 120px;
-    overflow: auto;
-    padding: 6px 12px 6px 12px;
-    border: 1px solid var(--whitegrey-d1);
-    background: var(--white);
-    border-radius: 4px;
-    word-break: break-word;
-}
-
-.gh-announcement-editor.dark {
-    background: #15171A;
-}
-
-.gh-announcement-editor .koenig-lexical *,
-.gh-announcement-editor .koenig-lexical-editor-input-placeholder {
-    font-family: var(--font-family) !important;
-    font-size: 1.4rem !important;
-    line-height: 1.5em !important;
-}
-
-.gh-announcement-editor .koenig-lexical p,
-.gh-announcement-editor .koenig-lexical .kg-prose {
-    height: 108px;
-    color: var(--darkgrey);
-    font-size: 1.4rem !important;
-    line-height: 1.5em !important;
-}
-
-.gh-announcement-editor .koenig-lexical a {
-    display: inline;
-    padding: 0;
-    height: auto;
-}
diff --git a/ghost/admin/app/styles/layouts/tags.css b/ghost/admin/app/styles/layouts/tags.css
index c6aac8a854c..6f45974b378 100644
--- a/ghost/admin/app/styles/layouts/tags.css
+++ b/ghost/admin/app/styles/layouts/tags.css
@@ -177,6 +177,57 @@ label.gh-tag-setting-codeheader {
     width: 100%;
 }
 
+.input-color {
+    display: flex;
+    position: relative;
+}
+
+.input-color:after {
+    content: "#";
+    position: absolute;
+    top: 9px;
+    left: 43px;
+    color: var(--midlightgrey);
+    font-family: "Consolas", monaco, monospace;
+    font-size: 13px;
+}
+
+.input-color:focus {
+    border: none;
+}
+
+.input-color input {
+    padding-left: 52px;
+    width: 112px;
+    height: 38px;
+    padding-right: 8px;
+    font-family: "Consolas", monaco, monospace;
+    font-size: 13px;
+}
+
+.input-color .color-box {
+    position: absolute;
+    top: 1px;
+    left: 1px;
+    width: 36px;
+    height: 36px;
+    display: inline-block;
+    background-color: var(--lightgrey);
+    border-top-left-radius: 4px;
+    border-bottom-left-radius: 4px;
+    border-right: 1px solid var(--input-border);
+    box-shadow: inset 0 0 0 1px var(--white);
+}
+
+.input-color input:focus + .color-box {
+    top: 2px;
+    left: 2px;
+    width: 35px;
+    height: 34px;
+    border-top-left-radius: 3px;
+    border-bottom-left-radius: 3px;
+}
+
 .gh-tag-settings-colorcontainer .input-color input {
     position: relative;
     width: 112px;
@@ -263,4 +314,180 @@ label.gh-tag-setting-codeheader {
 
 .gh-view-tag-link:hover svg {
     fill: var(--darkgrey);
-}
\ No newline at end of file
+}
+
+.gh-setting-content-extended label {
+    display: block;
+    font-size: 1.3rem;
+    font-weight: 600;
+    color: var(--darkgrey);
+    margin-bottom: 4px;
+}
+
+.gh-setting-content-extended textarea {
+    font-size: 1.5rem;
+    letter-spacing: 0;
+    line-height: 1.4em;
+    max-width: initial;
+}
+
+.gh-setting-content-extended .gh-image-uploader {
+    margin: 0;
+    border: 1px solid var(--whitegrey-d2);
+}
+
+.gh-setting-content-extended .gh-btn span {
+    height: 36px;
+    line-height: 36px;
+}
+
+.gh-setting-content-extended {
+    width: 100%;
+}
+
+/* Code injection
+/* ---------------------------------------------------------- */
+
+.settings-code {
+    max-width: 100%;
+}
+
+.settings-code label {
+    font-size: 1.5rem;
+    letter-spacing: 0;
+    margin-bottom: 2px;
+}
+
+.settings-code p {
+    margin: 0 0 8px;
+    font-size: 1.3rem;
+}
+
+.settings-code code {
+    background-color: rgb(242, 244, 247);
+    border: 1px solid var(--lightgrey);
+    vertical-align: middle;
+    font-size: 1.2rem;
+}
+
+.settings-code-editor {
+    padding: 0;
+    min-width: 250px;
+    min-height: 300px;
+    max-width: 1224px;
+    width: calc(100vw - 416px) !important;
+    height: auto;
+    line-height: 22px;
+    border: 1px solid var(--lightgrey);
+}
+
+.settings-code-editor:hover {
+    cursor: text;
+}
+
+.settings-code-editor textarea {
+    width: 100%;
+    max-width: none;
+    min-height: 300px;
+    line-height: 22px;
+    border: none;
+}
+
+.settings-code-editor .CodeMirror {
+    padding: 0;
+    border: none;
+    border-radius: inherit;
+    background: var(--white);
+    color: var(--darkgrey);
+}
+
+.settings-code-editor .CodeMirror-gutters {
+    background-color: var(--whitegrey-l2);
+    border-right: 1px solid var(--lightgrey);
+}
+
+.settings-code-editor .CodeMirror-cursor {
+    border: 1px solid var(--midgrey);
+}
+
+.settings-code-editor .cm-s-xq-light span.cm-meta {
+    color: #000;
+}
+
+@media (max-width: 800px) {
+    .settings-code-editor {
+        width: calc(100vw - 8vw - 40px) !important;
+    }
+}
+
+.gh-seo-container {
+    display: flex;
+    width: 100%;
+    margin-bottom: 2.4rem;
+    padding: 20px 30px 16px;
+    border: 1px solid var(--whitegrey-d1);
+    font-family: Arial, sans-serif;
+    background: #fff;
+    border-radius: 3px;
+}
+
+.gh-seo-container svg {
+    width: 92px;
+    height: 30px;
+    margin-right: 32px;
+}
+
+@media (max-width: 1360px) {
+    .gh-seo-settings {
+        flex-direction: column;
+    }
+
+    .gh-seo-settings .form-group {
+        max-width: 100%;
+    }
+
+    .gh-seo-settings-left,
+    .gh-seo-container {
+        max-width: 591px;
+    }
+}
+
+@media (min-width: 1360px) {
+    .gh-seo-settings-left {
+        margin-right: 2.4rem;
+    }
+
+    .gh-seo-container {
+        max-width: 1091px;
+    }
+}
+
+.gh-og-container {
+    width: 476px;
+    margin-bottom: 2.4rem;
+    border: 1px solid var(--whitegrey-d1);
+    background: #fff;
+    border-radius: 3px;
+}
+
+@media (max-width: 1080px) {
+    .gh-og-container {
+        width: 100%;
+        max-width: 476px;
+    }
+}
+
+.gh-twitter-container {
+    width: 591px;
+    margin-bottom: 2.4rem;
+    border: 1px solid var(--whitegrey-d1);
+    background: #fff;
+    border-radius: 3px;
+}
+
+@media (max-width: 1080px) {
+    .gh-twitter-container {
+        width: 100%;
+        max-width: 591px;
+    }
+}
diff --git a/ghost/admin/app/styles/layouts/tiers.css b/ghost/admin/app/styles/layouts/tiers.css
index 0074d3850bc..4fa7f757c5c 100644
--- a/ghost/admin/app/styles/layouts/tiers.css
+++ b/ghost/admin/app/styles/layouts/tiers.css
@@ -1,30 +1,3 @@
-/* Tier list */
-.gh-tier-list {
-    display: grid;
-    grid-template-columns: repeat(2, 1fr);
-    grid-gap: 32px;
-}
-
-@media (max-width: 980px) {
-    .gh-tier-list {
-        grid-template-columns: repeat(1, 1fr);
-    }
-}
-
-.gh-contentfilter-menu-trigger-tiers {
-    margin-right: 0 !important;
-    background: transparent !important;
-}
-
-.gh-contentfilter-menu-trigger-tiers .ember-power-select-selected-item {
-    font-weight: 400 !important;
-    color: var(--darkgrey) !important;
-}
-
-.gh-tier-cards {
-    margin: 0 0 24px;
-}
-
 .gh-tier-card {
     position:relative;
     display: flex;
@@ -38,141 +11,6 @@
     }
 }
 
-.gh-tier-card-button-container {
-    position: absolute;
-    right: 24px;
-    top: 24px;
-    margin-right: 0;
-}
-
-.gh-tier-card-actions-button, .gh-tier-card-edit-button {
-    margin-right: 0;
-    cursor: pointer;
-}
-
-.gh-tier-card-actions-button.gh-btn span, .gh-tier-card-edit-button.gh-btn span {
-    height: 24px;
-}
-
-.gh-tier-actions-menu {
-    top: calc(100% + 6px);
-    left: auto;
-    right: 0;
-}
-
-.gh-tier-actions-menu.closed {
-    display: none;
-}
-
-.gh-tier-card-block {
-    flex-basis: 30%;
-}
-
-.gh-tier-card-block:not(:first-of-type) {
-    padding-left: 16px;
-}
-
-.gh-tier-card-block h4 {
-    font-size: 1.3rem;
-    font-weight: 500;
-}
-
-.gh-tier-card-block h4 .counter {
-    font-weight: 400;
-    color: var(--midgrey);
-}
-
-.gh-tier-card-name {
-    font-size: 1.8rem;
-    font-weight: 600;
-    margin: 0;
-}
-
-.gh-tier-card-empty-state {
-    display: flex;
-    justify-content: center;
-    align-items: center;
-}
-
-.gh-tier-card-empty-state p {
-    margin-bottom: 0;
-    padding: 3.2rem;
-    color: var(--midgrey);
-}
-
-.gh-tier-card-description {
-    font-size: 1.3rem;
-    line-height: 1.45em;
-    margin: 4px 20px 4px 0;
-    color: var(--midgrey);
-}
-
-.gh-tier-card-block.title-block {
-    flex-basis: 40%;
-}
-
-.gh-tier-card-block.benefits-block .gh-tier-card-description {
-    margin-top: 9px;
-}
-
-.gh-tier-card-block ul.benefits {
-    list-style: none;
-    margin: 10px 0 0;
-    padding: 0;
-}
-
-.gh-tier-card-block ul.benefits li {
-    display: flex;
-    align-items: flex-start;
-    font-size: 1.3rem;
-    line-height: 1.45em;
-    color: var(--middarkgrey);
-}
-
-.gh-tier-card-block ul.benefits li svg {
-    flex-basis: 18px;
-    width: 14px;
-    height: 14px;
-    min-width: 18px;
-    margin-top: 3px;
-    margin-right: 4px;
-    color: var(--black);
-}
-
-.gh-tier-card-block ul.benefits li span {
-    flex-grow: 1;
-}
-
-.gh-tier-card-block.price-block {
-    display: flex;
-    flex-direction: column;
-    align-items: flex-end;
-    margin: 0 70px 0 20px;
-}
-
-.gh-tier-price-container {
-    display: flex;
-    flex-direction: column;
-    border: 1px solid var(--whitegrey);
-}
-
-.gh-expendable-free-membership .gh-tier-price-container {
-    margin: 0 60px 0 20px;
-}
-
-.gh-expendable-free-membership .gh-tier-card-price {
-    border-right: none !important;
-}
-
-.gh-expendable-free-membership .gh-tier-card-block{
-    flex-basis: auto;
-}
-
-.gh-tier-price-cards {
-    display: inline-flex;
-    justify-content: flex-end;
-}
-
 .gh-tier-card-price {
     display: flex;
     flex-direction: column;
@@ -186,19 +24,6 @@
     min-height: 66px;
 }
 
-.gh-tier-free-trial-label {
-    text-align: center;
-    font-size: 1.25rem;
-    color: var(--midgrey);
-    padding: 4px;
-    border-top: 1px solid var(--whitegrey);
-}
-
-.gh-tier-free-trial-days {
-    font-weight: 600;
-    color: var(--darkgrey);
-}
-
 .gh-tier-card-price:first-of-type {
     border-right: 1px solid var(--whitegrey);
 }
@@ -249,581 +74,7 @@
     margin-top: 2px;
 }
 
-.gh-tier-cards-footer {
-    display: flex;
-    align-items: center;
-    margin-top: -7px;
-    color: var(--midgrey);
-    font-size: 1.35rem;
-}
-
-.gh-btn-add-tier,
-.gh-btn-add-tier:hover {
-    margin-right: 5px;
-}
-
-.gh-btn-add-tier svg {
-    width: 1rem;
-    height: 1rem;
-    margin: 1px 4px 0 0;
-}
-
-.gh-tier-list-icon {
-    display: flex;
-    align-items: flex-end;
-    justify-content: center;
-    color: var(--green);
-    margin-bottom: 8px;
-    height: 72px;
-}
-
-.gh-tier-list-icon svg {
-    width: 60px;
-    height: 60px;
-}
-
-.gh-tier-list-siteicon {
-    width: 54px;
-    height: 54px;
-    background-color: transparent;
-    background-size: 54px;
-    border-radius: 3px;
-    margin-bottom: 6px;
-}
-
-.gh-tier-list-icon svg circle,
-.gh-tier-list-icon svg path {
-    stroke-width: 1px !important;
-}
-
-/* Tier details */
-.gh-tier-details {
-    display: grid;
-    grid-template-columns: 1fr;
-    grid-gap: 32px;
-    margin-bottom: 3vw;
-}
-
-.gh-tier-details-form {
-    display: flex;
-    align-items: flex-start;
-    padding-top: 20px !important;
-}
-
-.gh-tier-icon-container {
-    width: unset;
-    padding-bottom: 0;
-    margin-bottom: 0;
-}
-
-.gh-tier-icon {
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    background: var(--white);
-    width: 124px;
-    height: 124px;
-    margin-right: 24px;
-    border: 1px solid var(--whitegrey);
-    border-radius: 3px;
-}
-
-.gh-tier-details-fields {
-    width: 100%;
-}
-
-.gh-tier-details-fields .max-width {
-    max-width: 840px;
-}
-
-.gh-tier-details-fields .form-group:last-of-type {
-    padding-bottom: 0;
-    margin-bottom: 0;
-}
-
-.gh-tier-details section {
-    display: flex;
-    flex-direction: column;
-    justify-content: stretch;
-}
-
-/* Tier stats */
-.gh-tier-stat-container {
-    display: flex;
-    flex-direction: column;
-}
-
-.gh-tier-stat-details .data {
-    white-space: nowrap;
-    font-size: 3.1rem;
-    line-height: 1em;
-    font-weight: 700;
-    letter-spacing: 0;
-    margin: 0 0 2px;
-    padding: 0;
-}
-
-.gh-tier-stat-details .info {
-    color: var(--midgrey);
-    margin: 0 0 10px;
-    padding: 0;
-}
-
-.gh-tier-chart {
-    color: var(--whitegrey);
-    border: 1px solid var(--whitegrey);
-    border-top-color: transparent;
-    height: 90px;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    margin: 0 0 12px;
-}
-
-/* Price list */
-.gh-price-list {
-    margin-bottom: 24px;
-}
-
-.gh-price-list a span {
-    color: var(--midgrey);
-    font-size: 1.3rem;
-}
-
-.gh-price-list-actionlist {
-    display: flex;
-    align-items: center;
-    justify-content: flex-end;
-    width: 100%;
-    line-height: 1;
-}
-
-.gh-price-list .gh-list-row:hover .gh-price-list-actionlist {
-    opacity: 1;
-}
-
-.gh-price-list-actionlist a,
-.gh-price-list-actionlist button {
-    margin-left: 15px;
-    padding: 0;
-    line-height: 0;
-}
-
-.gh-price-list-actionlist a span,
-.gh-price-list-actionlist button span {
-    display: inline-block;
-    line-height: 1;
-    height: unset;
-    border-radius: 3px;
-    padding: 4px 6px;
-    color: var(--darkgrey);
-    font-weight: 500;
-    font-size: 1.2rem !important;
-    text-transform: uppercase;
-}
-
-.gh-price-list-actionlist a:hover span,
-.gh-price-list-actionlist button:hover span {
-    background: var(--whitegrey);
-}
-
-.gh-price-list-actionlist a.archived:hover span,
-.gh-price-list-actionlist button.archived:hover span {
-    background: color-mod(var(--red) a(10%));
-    color: var(--red);
-}
-
-.gh-price-list-title,
-.gh-price-list-price {
-    width: 50%;
-}
-
-.gh-price-list-name span.archived {
-    background: var(--lightgrey-l2);
-    color: var(--midgrey);
-    font-size: 1.2rem;
-}
-
-.gh-price-list-archived .gh-price-list-name .name,
-.gh-price-list-archived .gh-price-list-description,
-.gh-price-list-archived .gh-price-list-price span,
-.gh-price-list-archived .gh-price-list-subscriptions span {
-    opacity: 0.5;
-}
-
-.gh-price-list-noprices {
-    text-align: center;
-    padding: 48px 0;
-    color: var(--midgrey);
-}
-
-.gh-btn-archive-toggle {
-    width: 80px;
-}
-
 .tier-actions-menu.fade-out {
     animation-duration: 0.01s;
     pointer-events: none;
 }
-
-/* Add/edit tier modal */
-.fullscreen-modal-edit-tier {
-    max-width: 1080px;
-}
-
-.gh-tier-modal-content {
-    margin: -32px -32px 0;
-    padding: 32px 32px 0;
-    max-height: calc(100vh - 16vw);
-    overflow-y: auto;
-}
-
-.gh-form-edit-tier .gh-main-section {
-    margin-bottom: 32px;
-    grid-template-columns: 1fr 0.8fr 1.2fr;
-}
-
-.gh-form-edit-tier .gh-main-section-block {
-    display: flex;
-    flex-direction: column;
-    margin-bottom: 0;
-}
-
-.gh-form-edit-tier .gh-main-section-content {
-    padding-top: 16px;
-    margin-bottom: 0;
-}
-
-.gh-tier-priceform-block {
-    margin-bottom: 32px;
-}
-
-.gh-tier-priceform-block .form-group:last-of-type {
-    margin-bottom: 0;
-}
-
-.gh-tier-priceform-pricecurrency {
-    display: grid;
-    grid-template-columns: 1fr 2fr;
-    grid-gap: 20px;
-}
-
-.gh-form-edit-tier .gh-main-section-content.gh-tier-form-benefits {
-    padding-left: 8px;
-    margin-bottom: 0;
-}
-
-.gh-tier-benefits .gh-input {
-    padding: 6px 28px 6px 30px;
-}
-
-.gh-tier-benefits .gh-blognav-line {
-    position: relative;
-}
-
-.gh-tier-benefits .gh-blognav-line svg {
-    position: absolute;
-    width: 12px;
-    height: 12px;
-    top: 13px;
-    left: 11px;
-}
-
-.gh-tier-benefits .gh-blognav-line.placeholder {
-    color: var(--midlightgrey);
-}
-
-.gh-tier-benefits .gh-blognav-line svg path {
-    stroke-width: 3px;
-}
-
-.gh-tier-benefits .gh-blognav-item {
-    position: relative;
-    align-items: center;
-}
-
-.gh-tier-benefits .gh-blognav-item.gh-blognav-item--error {
-    align-items: flex-start;
-}
-
-.gh-blognav-item--error button.gh-blognav-add {
-    margin-top: 12px;
-}
-
-.gh-tier-benefits .gh-blognav-label {
-    margin-right: 0;
-}
-
-.gh-tier-benefits .gh-blognav-label .response {
-    position: relative;
-    font-size: 1.25rem;
-    margin: 2px 0 6px;
-}
-
-.gh-tier-benefits .gh-blognav-delete {
-    position: absolute;
-    top: 4px;
-    right: 8px;
-    opacity: 0;
-    color: var(--midgrey);
-}
-
-.gh-tier-benefits .gh-blognav-delete:hover {
-    color: var(--red);
-}
-
-.gh-tier-benefits .gh-blognav-add {
-    margin-top: 2px;
-}
-
-.gh-tier-benefits .gh-blognav-grab {
-    text-indent: 0px;
-    opacity: 0;
-}
-
-.gh-tier-benefits .gh-blognav-item:hover .gh-blognav-delete,
-.gh-tier-benefits .gh-blognav-item:hover .gh-blognav-grab {
-    opacity: 1;
-}
-
-.gh-tier-benefits .gh-blognav-item:not(.gh-blognav-item--sortable):not(:last-of-type) {
-    margin-bottom: 16px;
-}
-
-.gh-tier-benefit-hint {
-    color: var(--midgrey-d2);
-    font-size: 1.25rem !important;
-    font-weight: 400;
-    padding: 0 16px;
-    margin-top: -12px;
-}
-
-.gh-tier-form-tierpreview-content {
-    position: sticky;
-    top: 45px;
-    height: max-content;
-}
-
-.gh-tier-form-tierpreview .gh-main-section-content {
-    flex: 1;
-    max-width: 420px;
-    min-width: 320px;
-    position: relative;
-    display: flex;
-    flex-direction: column;
-    align-items: flex-start;
-    justify-content: stretch;
-    background: white;
-    padding: 32px;
-    border-radius: 7px;
-    border: 1px solid #e1e1e1;
-    min-height: 200px;
-    letter-spacing: normal;
-}
-
-.gh-portal-tier-card-header {
-    width: 100%;
-    min-height: 56px;
-}
-
-.gh-tier-form-tierpreview .gh-main-section-content .gh-portal-tier-name {
-    font-size: 1.8rem;
-    font-weight: 600;
-    line-height: 1.3em;
-    letter-spacing: 0px;
-    margin-top: -4px;
-    margin-bottom: 0;
-    word-break: break-word;
-    width: 100%;
-}
-
-.gh-tier-form-tierpreview .gh-main-section-content .gh-portal-tier-description {
-    font-size: 1.55rem;
-    font-weight: 600;
-    line-height: 1.4em;
-    width: 100%;
-    margin-top: 16px;
-    color: #3d3d3d;
-}
-
-.gh-portal-tier-card-pricecontainer {
-    display: flex;
-    flex-direction: row;
-    align-items: flex-end;
-    justify-content: space-between;
-    flex-wrap: wrap;
-    row-gap: 10px;
-    column-gap: 4px;
-    width: 100%;
-    margin-top: 16px;
-}
-
-.gh-portal-tier-price {
-    display: flex;
-    justify-content: center;
-    color: #1d1d1d;
-}
-
-.gh-portal-tier-card-details {
-    flex: 1;
-    display: flex;
-    flex-direction: column;
-    width: 100%;
-}
-
-.gh-portal-tier-card-detaildata {
-    flex: 1;
-}
-
-.gh-portal-tier-price .amount {
-    font-size: 3.4rem;
-    font-weight: 700;
-    line-height: 1em;
-    letter-spacing: -1.3px;
-}
-
-.gh-tier-form-tierpreivew-cadence {
-    display: flex;
-    align-items: baseline;
-    justify-content: space-between;
-}
-
-.gh-tier-form-tierpreivew-cadence .gh-btn,
-.gh-tier-form-tierpreivew-cadence .gh-btn span {
-    background: transparent !important;
-    padding: 0;
-    line-height: 1em;
-    height: auto;
-    font-size: 1.3rem;
-    color: var(--midlightgrey);
-    margin-left: 4px;
-    font-weight: 400;
-    overflow: unset;
-}
-
-.gh-tier-form-tierpreivew-cadence .gh-btn:hover span {
-    color: var(--middarkgrey);
-}
-
-.gh-tier-form-tierpreivew-cadence .gh-btn.selected span {
-    font-weight: 500;
-    color: var(--darkgrey);
-}
-
-.gh-tier-form-tierpreview .monthly-price {
-    display: flex;
-    align-items: baseline;
-    font-size: 3.3rem;
-    font-weight: 500;
-    line-height: 1em;
-    color: #3d3d3d;
-}
-
-.gh-tier-form-tierpreview .currency-sign {
-    align-self: flex-start;
-    font-size: 2.7rem;
-    font-weight: 700;
-    line-height: 1.115em;
-    text-transform: uppercase;
-}
-
-.gh-tier-form-tierpreview .billing-period {
-    align-self: flex-end;
-    font-size: 1.5rem;
-    letter-spacing: 0;
-    line-height: 1.4em;
-    color: #686868;
-    margin-left: 5px;
-    font-weight: 400;
-}
-
-.gh-portal-discount-label {
-    position: relative;
-    font-size: 1.25rem;
-    line-height: 1em;
-    font-weight: 600;
-    letter-spacing: 0.3px;
-    color: #1d1d1d;
-    padding: 6px 9px;
-    text-align: center;
-    white-space: nowrap;
-    border-radius: 999px;
-    margin-right: -4px;
-    margin-top: -4px;
-    max-height: 24.5px;
-}
-
-.gh-portal-discount-label span {
-    position: absolute;
-    content: "";
-    display: block;
-    top: 0;
-    right: 0;
-    bottom: 0;
-    left: 0;
-    border-radius: 999px;
-    opacity: 0.2;
-}
-
-.gh-tier-form-tierpreview .gh-portal-tier-benefits {
-    font-size: 1.5rem;
-    letter-spacing: 0;
-    line-height: 1.4em;
-    width: 100%;
-    margin-top: 16px;
-}
-
-.gh-tier-form-tierpreview .gh-portal-tier-benefit {
-    display: flex;
-    align-items: flex-start;
-    margin-bottom: 10px;
-    color: #3d3d3d;
-}
-
-.gh-portal-tier-benefit svg {
-    width: 14px;
-    height: 14px;
-    min-width: 14px;
-    margin: 3px 10px 0 0;
-    overflow: visible;
-}
-
-.gh-tier-form-tierpreview .gh-portal-tier-benefit polyline,
-.gh-tier-form-tierpreview .gh-portal-tier-benefit g,
-.gh-tier-form-tierpreview .gh-portal-tier-benefit path {
-    stroke-width: 3px;
-}
-
-.gh-tier-form-tierpreview .gh-portal-benefit-title {
-    letter-spacing: normal;
-}
-
-.gh-tier-form-tierpreview .placeholder {
-    opacity: 0.35;
-}
-
-.gh-tier-form-tierpreview .gh-portal-discount-label-trial {
-    font-weight: 600;
-    font-size: 1.3rem;
-    line-height: 1;
-    margin-top: 4px;
-}
-
-.gh-tier-setting-title {
-    font-size: 1.3rem;
-    font-weight: 600;
-    margin: 0;
-}
-
-.gh-tier-settings .for-switch.small {
-    width: 36px !important;
-    height: 22px !important;
-}
-
-.gh-tier-settings .gh-tier-settings-hide {
-    display: none !important;
-}
-
-.gh-tier-settings .gh-tier-settings-show {
-    display: flex !important;
-}
\ No newline at end of file
diff --git a/ghost/admin/app/styles/layouts/user.css b/ghost/admin/app/styles/layouts/user.css
deleted file mode 100644
index b5457108902..00000000000
--- a/ghost/admin/app/styles/layouts/user.css
+++ /dev/null
@@ -1,212 +0,0 @@
-/* User profile /ghost/settings/users/<user>/
-/* ---------------------------------------------------------- */
-
-
-/* User actions menu
-/* ---------------------------------------------------------- */
-
-.user-actions-cog {
-    margin-right: 10px;
-    color: var(--darkgrey);
-}
-
-.user-actions-cog svg {
-    height: 16px;
-    width: 16px;
-    margin-right: 0;
-}
-
-.user-actions-cog svg path {
-    stroke: var(--darkgrey);
-}
-
-.user-actions-menu {
-    top: calc(100% + 6px);
-    right: 10px;
-    left: auto;
-}
-
-.user-actions-menu.fade-out {
-    animation-duration: 0.01s;
-    pointer-events: none;
-}
-
-
-/* Layout
-/* ---------------------------------------------------------- */
-
-.settings-user {
-    padding: 0 0 3vw;
-}
-
-.user-cover {
-    display: block;
-    overflow: hidden;
-    margin: 0;
-    width: 100%;
-    height: 300px;
-    margin-bottom: 30px;
-    background: #fafafa no-repeat center center;
-    background-size: cover;
-}
-
-.user-cover-edit {
-    position: absolute;
-    top: 20px;
-    left: 20px;
-    z-index: 2;
-    min-height: 37px;
-    height: 37px;
-    border-width: 0;
-    background: rgba(0, 0, 0, 0.3);
-    border-radius: var(--border-radius);
-    color: rgba(255, 255, 255, 0.8);
-    text-shadow: none;
-    transition: color 0.3s ease, background 0.3s ease;
-}
-
-.user-cover-edit:hover {
-    background: rgba(0, 0, 0, 0.5);
-    color: #fff;
-}
-
-.user-details-bottom,
-.user-details-form {
-    max-width: 540px;
-    margin: 2vw auto 0;
-}
-
-.user-details-form {
-    border-top: 1px solid var(--lightgrey);
-    padding-top: 4vw;
-    margin-bottom: -2vw;
-}
-
-
-/* Edit user
-/* ---------------------------------------------------------- */
-
-.user-profile {
-    position: relative;
-    z-index: 1;
-}
-
-@media (max-width: 550px) {
-    .user-profile fieldset {
-        padding: 0 15px;
-    }
-}
-
-.user-profile textarea {
-    min-width: 100%;
-}
-
-
-/* Profile picture
-/* ---------------------------------------------------------- */
-
-.user-image {
-    position: absolute;
-    top: 236px;
-    left: 0;
-    right: 0;
-    z-index: 2;
-    margin: 0 auto;
-    padding: 0;
-    width: 120px;
-    height: 120px;
-    border-radius: 9999px;
-    border: 4px solid var(--white);
-    text-align: center;
-}
-
-.user-image .img {
-    display: block;
-    width: 100%;
-    height: 100%;
-    background-position: center center;
-    background-size: cover;
-    border-radius: 9999px;
-}
-
-.user-image:hover .edit-user-image {
-    opacity: 1;
-}
-
-.edit-user-image {
-    position: absolute;
-    top: 0;
-    left: 0;
-    width: 100%;
-    height: 100%;
-    background: rgba(0, 0, 0, 0.5);
-    border-radius: 9999px;
-    color: #fff;
-    text-decoration: none;
-    text-transform: uppercase;
-    font-size: 12px;
-    line-height: 100px;
-    opacity: 0;
-    transition: opacity 0.3s ease;
-}
-
-/* User roles modal
-/* ---------------------------------------------------------- */
-
-@media (max-height: 740px) {
-    .fullscreen-modal-change-role {
-        overflow-y: auto;
-    }
-    .fullscreen-modal-change-role .modal-content {
-        box-shadow: none !important;
-    }
-}
-
-/* Delete user modal
-/* ---------------------------------------------------------- */
-
-.gh-transfer-tag strong {
-    color: var(--midgrey);
-    font-weight: 600;
-}
-
-/* Notifications */
-.user-settings-heading {
-    margin-bottom: 3rem;
-    font-size: 1.55rem;
-    font-weight: 700;
-    line-height: 1.3em;
-}
-
-.user-settings-subgroup {
-    border-top: 1px solid var(--lightgrey);
-    font-size: 1.55rem;
-    font-weight: 700;
-    line-height: 1.3em;
-    padding-top: 3vw;
-    margin-top: 4vw;
-    margin-bottom: -1vw;
-}
-
-.user-settings-subgroup .form-group {
-    margin-bottom: 0;
-}
-
-.user-setting-toggle {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    margin-top: 20px;
-}
-
-.user-setting-toggle label {
-    margin-bottom: 0;
-}
-
-.user-setting-toggle p {
-    margin-top: 0;
-}
-
-.user-settings-subgroup .for-switch {
-    width: 38px !important;
-}
\ No newline at end of file
diff --git a/ghost/admin/app/styles/layouts/users.css b/ghost/admin/app/styles/layouts/users.css
deleted file mode 100644
index 7c9e44fb34e..00000000000
--- a/ghost/admin/app/styles/layouts/users.css
+++ /dev/null
@@ -1,291 +0,0 @@
-/* Users /ghost/settings/users/
-/* ---------------------------------------------------------- */
-
-.gh-invited-users .apps-grid-cell:hover {
-    background: none;
-}
-
-.gh-invited-users .gh-badge {
-    text-transform: none;
-}
-
-@media (max-width: 500px) {
-    .gh-invited-users .apps-card-meta {
-        max-width: 165px;
-    }
-
-    .gh-invited-users .apps-card-app-title {
-        width: 200px;
-    }
-
-    .gh-invited-users .apps-card-app-desc {
-        max-height: none;
-        display: block;
-    }
-
-    .gh-invited-users .apps-configured {
-        flex-direction: column;
-        align-items: flex-end;
-    }
-
-    .gh-invited-users .apps-configured a {
-        margin-bottom: 7px
-    }
-}
-
-@media (max-width: 600px) {
-    .gh-user-arrow-icon {
-        display: none;
-    }
-}
-
-
-.user-list-item-icon {
-    flex-shrink: 0;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    overflow: hidden;
-    margin-right: 12px;
-    width: 36px;
-    height: 36px;
-    background: #E5EFF5;
-    border-radius: 100%;
-    color: transparent;
-    font-size: 0;
-}
-
-.user-list-item-icon svg {
-    fill: var(--midgrey);
-    height: 14px;
-    width: auto;
-}
-
-.user-list-item-figure {
-    position: relative;
-    display: block;
-    width: 36px;
-    height: 36px;
-    margin-right: 12px;
-    margin-left: 3px;
-    background-position: center center;
-    background-size: cover;
-    border-radius: 100%;
-}
-
-.user-list-item-figure img {
-    position: absolute;
-    top: 0;
-    left: 0;
-    width: 100%;
-    height: 100%;
-    opacity: 0;
-}
-
-.user-list-item-no-interaction a.disabled {
-    cursor: default;
-}
-
-
-.user-list-item-no-interaction .gh-badge {
-    margin-right: 28px;
-}
-
-.user-list-item-no-interaction.apps-grid-cell:hover {
-    background: transparent !important;
-}
-
-.user-list-item-no-interaction .gh-user-arrow-icon {
-    display: none;
-}
-
-.gh-team .apps-configured {
-    justify-content: flex-end;
-}
-
-.gh-team .apps-configured .gh-badge {
-    margin-left: 15px;
-}
-
-@media (max-width: 500px) {
-    .gh-active-users .apps-configured {
-        flex-wrap: nowrap;
-    }
-
-    .gh-active-users .gh-badge:first-child {
-        margin-left: 0;
-    }
-}
-
-/* Role Labels
-/* ---------------------------------------------------------- */
-
-.gh-badge.owner {
-    background: var(--middarkgrey);
-    text-transform: uppercase;
-    color: var(--white);
-}
-
-.gh-badge.administrator {
-    background: color-mod(var(--pink) a(15%));
-    text-transform: uppercase;
-    color: var(--pink-d2);
-}
-
-.gh-badge.editor {
-    background: color-mod(var(--blue) a(20%));
-    text-transform: uppercase;
-    color: var(--blue-d2);
-}
-
-.gh-badge.contributor {
-    background: var(--lightgrey);
-    text-transform: uppercase;
-    color: var(--middarkgrey);
-}
-
-.gh-badge.author {
-    background: color-mod(var(--green) a(20%));
-    text-transform: uppercase;
-    color: var(--green-d2);
-}
-
-.gh-badge.suspended {
-    background: var(--lightgrey);
-    text-transform: uppercase;
-    color: var(--middarkgrey);
-    margin-left: 1.2rem;
-}
-
-.gh-badge.locked {
-    background: none;
-    color: var(--midgrey);
-}
-
-.gh-badge.locked svg path {
-    fill: none;
-}
-
-/* User invitation modal
-/* ---------------------------------------------------------- */
-
-@media (max-height: 900px) {
-    .fullscreen-modal-invite-user {
-        overflow-y: auto;
-    }
-    .fullscreen-modal-invite-user .modal-content {
-        box-shadow: none !important;
-    }
-}
-
-.gh-modal-invite-user {
-    margin: -32px -32px 0;
-    padding: 32px 32px 0;
-    max-height: calc(100vh - 120px);
-    overflow-y: auto;
-}
-
-.invite-new-user .modal-content {
-    width: 100%;
-    max-width: 600px;
-}
-
-.gh-roles-container .form-group {
-    margin-bottom: 0;
-    padding: 0;
-}
-
-.gh-roles-container .form-group label {
-    position: static;
-    display: block;
-    text-align: left;
-}
-
-.gh-roles-container .form-group input {
-    width: 100%;
-}
-
-.invite-new-user .gh-roles-container {
-    display: flex;
-    flex-direction: column;
-    margin: 2rem 0 0;
-}
-
-.invite-new-user p {
-    margin: 4px 0 20px;
-    color: var(--midgrey);
-    font-size: 1.3rem;
-    line-height: 1.2em;
-    font-weight: 400;
-}
-
-.gh-roles-container .gh-radio {
-    padding-bottom: 20px;
-    border-bottom: 1px solid var(--list-color-divider);
-}
-
-.gh-roles-container .gh-radio:first-child {
-    padding-top: 20px;
-}
-
-.gh-roles-container .gh-radio svg {
-    width: 16px;
-    height: 16px;
-    margin-left: 2px;
-    color: var(--midgrey);
-}
-
-.gh-roles-container .gh-radio-content {
-    margin-right: 2.4rem;
-}
-
-.gh-roles-container .popover {
-    width: 97%;
-    border: 1px solid var(--whitegrey-d1);
-    color: var(--darkgrey);
-    box-shadow: var(--shadow-3);
-}
-
-.gh-roles-container .popover-arrow {
-    display: none;
-}
-
-.gh-roles-container .popover table {
-    margin: .6em 0;
-}
-
-.gh-roles-container .popover td.left {
-    padding-right: 16px;
-    font-weight: 600;
-    white-space: nowrap;
-}
-
-.gh-roles-container .gh-btn-black,
-.gh-roles-container .gh-btn-green {
-    margin: 0;
-    width: 100%;
-}
-
-/* Reset all passwords modal
-/* ---------------------------------------------------------- */
-
-.gh-modal-reset-passwords .for-checkbox .input-toggle-component {
-    background: var(--white);
-}
-
-.gh-modal-reset-passwords h4 {
-    margin-bottom: .4rem;
-    font-size: 1.4rem;
-    font-weight: 600;
-    line-height: 1.4em;
-}
-
-.gh-modal-reset-passwords p {
-    margin: 0 0 2em;
-}
-
-.gh-modal-reset-passwords .description {
-    color: var(--midgrey);
-    font-size: 1.4rem;
-    font-weight: 300;
-}
\ No newline at end of file
diff --git a/ghost/admin/app/styles/layouts/whatsnew.css b/ghost/admin/app/styles/layouts/whatsnew.css
index 44da196a4eb..c584a95ac59 100644
--- a/ghost/admin/app/styles/layouts/whatsnew.css
+++ b/ghost/admin/app/styles/layouts/whatsnew.css
@@ -280,6 +280,47 @@
         0 -4px 7px rgba(0, 0, 0, 0.06);
 }
 
+.gh-about-container {
+    display: grid;
+    grid-template-columns: 2fr 1fr;
+    grid-gap: 80px;
+}
+
+.gh-whats-new-canvas .gh-about-container {
+    display: flex;
+    grid-template-columns: unset;
+    grid-gap: unset;
+    margin: 0 auto;
+    max-width: 920px;
+    margin-top: 60px;
+}
+
+.gh-about-container h2 {
+    font-size: 1.65rem;
+    line-height: 1.4em;
+    font-weight: 600;
+    border-bottom: 1px solid var(--lightgrey-l2);
+    padding-bottom: 12px;
+    margin-bottom: 12px;
+}
+
+.gh-about-box {
+    position: sticky;
+    top: 96px;
+    right: 0;
+    display: flex;
+    flex-grow: 1;
+    flex-direction: column;
+    height: max-content;
+    border-radius: 3px;
+    min-width: 300px;
+}
+
+.gh-about-box.grey {
+    border: none;
+    background: var(--main-color-content-greybg);
+}
+
 @media (max-width: 1380px) {
     .gh-wn-content {
         max-width: 36vw;
@@ -303,18 +344,6 @@
         grid-gap: 32px;
     }
 
-    .gh-env-details {
-        grid-row: 1/2;
-    }
-
-    .gh-about-content-actions {
-        display: grid;
-        grid-template-columns: 1fr 1fr 1fr;
-        grid-gap: 20px;
-        grid-row: 2/3;
-        margin-top: -12px;
-    }
-
     .gh-whats-new {
         grid-row: 3/4;
     }
@@ -329,15 +358,6 @@
     }
 }
 
-@media (max-width: 540px) {
-    .gh-about-content-actions {
-        grid-template-columns: unset;
-        grid-template-rows: auto;
-        grid-gap: 12px;
-        margin-top: -20px;
-    }
-}
-
 /* Custom card styles
 /* ---------------------------------------------------------- */
 
diff --git a/ghost/admin/app/styles/patterns/global.css b/ghost/admin/app/styles/patterns/global.css
index b296ab3f5a7..4c8769a93c1 100644
--- a/ghost/admin/app/styles/patterns/global.css
+++ b/ghost/admin/app/styles/patterns/global.css
@@ -591,10 +591,6 @@ button {
     line-height: inherit;
 }
 
-i {
-    display: block;
-}
-
 img,
 input[type="image"] {
     max-width: 100%;
diff --git a/ghost/admin/app/templates/lexical-editor.hbs b/ghost/admin/app/templates/lexical-editor.hbs
index 2a4fde9cebd..f5679a7fe3d 100644
--- a/ghost/admin/app/templates/lexical-editor.hbs
+++ b/ghost/admin/app/templates/lexical-editor.hbs
@@ -82,6 +82,7 @@
                 @setFeatureImage={{this.setFeatureImage}}
                 @setFeatureImageAlt={{this.setFeatureImageAlt}}
                 @setFeatureImageCaption={{this.setFeatureImageCaption}}
+                @handleFeatureImageCaptionBlur={{this.handleFeatureImageCaptionBlur}}
                 @clearFeatureImage={{this.clearFeatureImage}}
                 @cardOptions={{hash
                     post=this.post
diff --git a/ghost/admin/app/templates/settings.hbs b/ghost/admin/app/templates/settings.hbs
deleted file mode 100644
index b9c512376f8..00000000000
--- a/ghost/admin/app/templates/settings.hbs
+++ /dev/null
@@ -1,124 +0,0 @@
-<section class="gh-canvas">
-    <GhCanvasHeader class="gh-canvas-header">
-        <h2 class="gh-canvas-title" data-test-screen-title>
-            Settings
-        </h2>
-        <section class="view-actions">
-            {{#if this.upgradeStatus.message}}
-                <button type="button" class="gh-btn gh-btn-with-notification" {{on "click" (fn this.openAbout null)}} data-tooltip="Update available!">
-                    <span>About Ghost</span>
-                    <span class="gh-btn-notification-dot green"></span>
-                </button>
-            {{else}}
-                <button type="button" class="gh-btn gh-btn-with-notification" {{on "click" (fn this.openAbout null)}}>
-                    <span>About Ghost</span>
-                </button>
-            {{/if}}
-        </section>
-    </GhCanvasHeader>
-
-    <section class="view-container">
-        <div class="gh-setting-header gh-first-header">Website</div>
-        <div class="gh-settings-main-grid">
-            <LinkTo class="gh-setting-group" @route="settings.general" data-test-nav="general">
-                <span class="yellow">{{svg-jar "settings"}}</span>
-                <div>
-                    <h4>General</h4>
-                    <p>Basic publication details and site metadata</p>
-                </div>
-            </LinkTo>
-            <LinkTo class="gh-setting-group" @route="settings.design" data-test-nav="design">
-                <span class="blue">{{svg-jar "paint-palette"}}</span>
-                <div>
-                    <h4>Design</h4>
-                    <p>Customize your site and manage themes</p>
-                </div>
-            </LinkTo>
-            <LinkTo class="gh-setting-group" @route="settings.navigation" data-test-nav="navigation">
-                <span class="pink">{{svg-jar "compass"}}</span>
-                <div>
-                    <h4>Navigation</h4>
-                    <p>Set up primary and secondary menus</p>
-                </div>
-            </LinkTo>
-
-            <LinkTo class="gh-setting-group" @route="settings.staff" data-test-nav="staff">
-                <span class="green">{{svg-jar "staff"}}</span>
-                <div>
-                    <h4>Staff</h4>
-                    <p>Manage authors, editor and collaborators</p>
-                </div>
-            </LinkTo>
-
-            {{#if (feature 'announcementBar')}}
-            <LinkTo class="gh-setting-group" @route="settings.announcement-bar" data-test-nav="announcement-bar">
-                <span class="yellow">{{svg-jar "confetti"}}</span>
-                <div>
-                    <h4>Announcement bar</h4>
-                    <p>Highlight important updates or offers</p>
-                </div>
-            </LinkTo>
-            {{/if}}
-        </div>
-
-        <div class="gh-setting-header">Members</div>
-        <div class="gh-settings-main-grid">
-            <LinkTo class="gh-setting-group" @route="settings.membership" data-test-nav="members-membership">
-                <span class="blue">{{svg-jar "members"}}</span>
-                <div>
-                    <h4>Membership</h4>
-                    <p>Access, subscription, and pricing options</p>
-                </div>
-            </LinkTo>
-            <LinkTo class="gh-setting-group" @route="settings.newsletters" data-test-nav="members-email">
-                <span class="yellow">{{svg-jar "email-stroke"}}</span>
-                <div>
-                    <h4>Email newsletter</h4>
-                    <p>Customize emails and set email addresses</p>
-                </div>
-            </LinkTo>
-            <LinkTo class="gh-setting-group" @route="settings.analytics" data-test-nav="members-analytics">
-                <span class="green">{{svg-jar "chart"}}</span>
-                <div>
-                    <h4>Analytics</h4>
-                    <p>Decide what data you collect</p>
-                </div>
-            </LinkTo>
-        </div>
-
-        <div class="gh-setting-header">Advanced</div>
-        <div class="gh-settings-main-grid">
-            <LinkTo class="gh-setting-group" @route="settings.integrations" data-test-nav="integrations">
-                <span class="yellow">{{svg-jar "module"}}</span>
-                <div>
-                    <h4>Integrations</h4>
-                    <p>Make Ghost work with apps and tools</p>
-                </div>
-            </LinkTo>
-
-            <LinkTo class="gh-setting-group" @route="settings.code-injection" data-test-nav="code-injection">
-                <span class="green">{{svg-jar "brackets"}}</span>
-                <div>
-                    <h4>Code injection</h4>
-                    <p>Add code to your publication</p>
-                </div>
-            </LinkTo>
-
-            <LinkTo class="gh-setting-group" @route="settings.labs" data-test-nav="labs">
-                <span class="blue">{{svg-jar "labs"}}</span>
-                <div>
-                    <h4>Labs</h4>
-                    <p>Testing ground for new features</p>
-                </div>
-            </LinkTo>
-
-            <LinkTo class="gh-setting-group" @route="settings.history" data-test-nav="history">
-                <span class="pink">{{svg-jar "calendar-stroke"}}</span>
-                <div>
-                    <h4>History</h4>
-                    <p>View system event log</p>
-                </div>
-            </LinkTo>
-        </div>
-    </section>
-</section>
diff --git a/ghost/admin/app/templates/settings/analytics.hbs b/ghost/admin/app/templates/settings/analytics.hbs
deleted file mode 100644
index 60fd6f4ee05..00000000000
--- a/ghost/admin/app/templates/settings/analytics.hbs
+++ /dev/null
@@ -1,31 +0,0 @@
-<section class="gh-canvas">
-    <GhCanvasHeader class="gh-canvas-header">
-        <div class="flex flex-column">
-            <div class="gh-canvas-breadcrumb">
-                <LinkTo @route="settings">
-                    Settings
-                </LinkTo>
-                {{svg-jar "arrow-right-small"}} Analytics
-            </div>
-            <h2 class="gh-canvas-title" data-test-screen-title>
-                Analytics
-            </h2>
-        </div>
-        <section class="view-actions">
-            <GhTaskButton
-                @buttonText="Save"
-                @task={{this.saveSettings}}
-                @successText="Saved"
-                @runningText="Saving"
-                {{on-key "cmd+s"}}
-                @class="gh-btn gh-btn-primary gh-btn-icon"
-                data-test-button="save-analytics-settings"
-            />
-        </section>
-    </GhCanvasHeader>
-
-    <div>
-        <Settings::Analytics />
-    </div>
-</section>
-{{outlet}}
\ No newline at end of file
diff --git a/ghost/admin/app/templates/settings/announcement-bar/index.hbs b/ghost/admin/app/templates/settings/announcement-bar/index.hbs
deleted file mode 100644
index 8a8a8d2fbce..00000000000
--- a/ghost/admin/app/templates/settings/announcement-bar/index.hbs
+++ /dev/null
@@ -1,43 +0,0 @@
-<section class="gh-canvas gh-design" {{on-key "cmd+s" this.saveFromKeyboard}}>
-    <GhCanvasHeader class="gh-canvas-header">
-        <h2 class="gh-canvas-title" data-testid="announcement-bar-title">Announcement bar</h2>
-        <section class="view-actions">
-            {{#if (gt this.themeManagement.availablePreviewTypes.length 1)}}
-                <div class="gh-select gh-preview-page-selector">
-                    <OneWaySelect
-                        @value={{this.themeManagement.previewType}}
-                        @options={{this.themeManagement.availablePreviewTypes}}
-                        @optionValuePath="name"
-                        @optionLabelPath="label"
-                        @optionTargetPath="name"
-                        @update={{this.themeManagement.setPreviewType}}
-                    />
-                    {{svg-jar "arrow-down-small"}}
-                </div>
-            {{/if}}
-
-            <div class="gh-contentfilter gh-btn-group">
-                <button type="button" class="gh-btn gh-design-preview-mode {{if this.isDesktopPreview "gh-btn-group-selected"}}" {{on "click" (fn this.setPreviewSize "desktop")}} data-test-button="desktop-preview"><span>{{svg-jar "desktop"}}</span></button>
-                <button type="button" class="gh-btn gh-design-preview-mode {{if this.isMobilePreview "gh-btn-group-selected"}}" {{on "click" (fn this.setPreviewSize "mobile")}} data-test-button="mobile-preview"><span>{{svg-jar "mobile-phone"}}</span></button>
-            </div>
-
-            <GhTaskButton
-                @buttonText="Save"
-                @task={{this.saveTask}}
-                @successText="Saved"
-                @runningText="Saving"
-                @class="gh-btn gh-btn-primary gh-btn-icon"
-                data-test-button="save-settings"
-            />
-        </section>
-    </GhCanvasHeader>
-
-    <div class="view-container">
-        <GhBrowserPreview @isMobilePreview={{this.isMobilePreview}}>
-            <GhHtmlIframe
-                class={{if this.isMobilePreview "gh-post-preview-iframe" "site-frame"}}
-                @html={{this.themeManagement.previewHtml}}
-                @pageId={{this.themeManagement.previewType}} />
-        </GhBrowserPreview>
-    </div>
-</section>
\ No newline at end of file
diff --git a/ghost/admin/app/templates/settings/code-injection-loading.hbs b/ghost/admin/app/templates/settings/code-injection-loading.hbs
deleted file mode 100644
index cec4c073044..00000000000
--- a/ghost/admin/app/templates/settings/code-injection-loading.hbs
+++ /dev/null
@@ -1,22 +0,0 @@
-<section class="gh-canvas">
-    <GhCanvasHeader class="gh-canvas-header">
-        <div class="flex flex-column">
-            <div class="gh-canvas-breadcrumb">
-                <LinkTo @route="settings">
-                    Settings
-                </LinkTo>
-                {{svg-jar "arrow-right-small"}} Code injection
-            </div>
-            <h2 class="gh-canvas-title" data-test-screen-title>
-                Code injection
-            </h2>
-        </div>
-        <section class="view-actions">
-            <GhTaskButton @task={{this.saveTask}} @class="gh-btn gh-btn-primary gh-btn-icon" data-test-save-button={{true}} />
-        </section>
-    </GhCanvasHeader>
-
-    <section class="gh-content">
-        <GhLoadingSpinner />
-    </section>
-</section>
diff --git a/ghost/admin/app/templates/settings/code-injection.hbs b/ghost/admin/app/templates/settings/code-injection.hbs
deleted file mode 100644
index 267d922e1aa..00000000000
--- a/ghost/admin/app/templates/settings/code-injection.hbs
+++ /dev/null
@@ -1,45 +0,0 @@
-<section class="gh-canvas">
-    <GhCanvasHeader class="gh-canvas-header">
-        <div class="flex flex-column">
-            <div class="gh-canvas-breadcrumb">
-                <LinkTo @route="settings">
-                    Settings
-                </LinkTo>
-                {{svg-jar "arrow-right-small"}} Code injection
-            </div>
-            <h2 class="gh-canvas-title" data-test-screen-title>
-                Code injection
-            </h2>
-        </div>
-        <section class="view-actions">
-            <GhTaskButton @task={{this.saveTask}} @class="gh-btn gh-btn-primary gh-btn-icon" data-test-save-button={{true}} />
-        </section>
-    </GhCanvasHeader>
-
-    <section class="view-container">
-        <form id="settings-code" novalidate="novalidate">
-            <fieldset>
-                <p class="gh-box gh-box-tip">
-                    {{svg-jar "idea"}}
-                    Ghost allows you to inject code into the top and bottom of your theme files without editing them. This allows for quick modifications to insert useful things like tracking codes and meta tags.
-                </p>
-
-                <div class="gh-main-section">
-                    <label for="ghost-head" class="gh-main-section-header bn">Site Header</label>
-                    <p class="gh-main-section-description bn">Code here will be injected into the <code>\{{ghost_head}}</code> tag on every page of the site</p>
-                    <div class="form-group settings-code">
-                        <GhCmEditor @value={{this.settings.codeinjectionHead}} @id="ghost-head" @class="gh-input settings-code-editor" @name="codeInjection[ghost_head]" @type="text" @update={{action (mut this.settings.codeinjectionHead)}} />
-                    </div>
-                </div>
-
-                <div class="gh-main-section">
-                    <label for="ghost-foot" class="gh-main-section-header bn">Site Footer</label>
-                    <p class="gh-main-section-description bn">Code here will be injected into the <code>\{{ghost_foot}}</code> tag on every page of the site</p>
-                    <div class="form-group settings-code">
-                        <GhCmEditor @value={{this.settings.codeinjectionFoot}} @id="ghost-foot" @class="gh-input settings-code-editor" @name="codeInjection[ghost_foot]" @type="text" @update={{action (mut this.settings.codeinjectionFoot)}} />
-                    </div>
-                </div>
-            </fieldset>
-        </form>
-    </section>
-</section>
diff --git a/ghost/admin/app/templates/settings/design/change-theme.hbs b/ghost/admin/app/templates/settings/design/change-theme.hbs
deleted file mode 100644
index fa400ea0fea..00000000000
--- a/ghost/admin/app/templates/settings/design/change-theme.hbs
+++ /dev/null
@@ -1,47 +0,0 @@
-<section class="gh-canvas">
-    <GhCanvasHeader class="gh-canvas-header">
-        <h2 class="gh-canvas-title" data-test-screen-title>Themes</h2>
-        <section class="view-actions">
-            <button type="button" class="mr4 gh-btn gh-advanced " {{on "click" this.toggleAdvanced}} data-test-button="toggle-advanced"><span>{{svg-jar (if this.showAdvanced "arrow-up-small" "arrow-down-small")}}Advanced</span></button>
-            <button type="button" class="gh-btn gh-btn-primary" {{on "click" this.startThemeUpload}} data-test-button="upload-theme"><span>Upload theme</span></button>
-        </section>
-    </GhCanvasHeader>
-
-    <section class="view-container">
-        {{#liquid-if this.showAdvanced}}
-            <div class="gh-themes-container">
-                <GhThemeTable @themes={{this.themes}} />
-            </div>
-        {{/liquid-if}}
-
-        <div class="gh-theme-directory-container">
-            <div class="theme-directory">
-                {{#each this.themesList as |theme|}}
-                    <LinkTo @route="settings.design.change-theme.view" @model={{theme.name}} class="td-item td-item-labs" data-test-theme-link={{theme.name}}>
-                        <div class="gh-theme-browser">
-                            <span class="gh-theme-browser-button"></span>
-                        </div>
-                        <div class="td-item-screenshot-labs relative">
-                            <img style="object-fit:contain;" src={{theme.image}} alt="{{theme.name}} Theme" />
-                        </div>
-                        <div class="td-item-desc">
-                            <div class="td-item-name">{{theme.name}}
-                                {{#if theme.isDefault}}
-                                    (Default)
-                                {{/if}}
-                                {{#if theme.isActive}}
-                                    <span class="gh-badge">Active</span>
-                                {{/if}}
-                            </div>
-                            <div class="td-item-category">{{theme.category}}</div>
-                        </div>
-                    </LinkTo>
-                {{/each}}
-            </div>
-        </div>
-    </section>
-</section>
-
-<section class="gh-theme-directory-footer" style="background-image:url(assets/img/footer-marketplace-bg.png);">
-    Find and buy third-party, premium themes from independent developers in the <a href="https://ghost.org/themes/" target="_blank" rel="noopener noreferrer" class="link">Ghost Marketplace →</a>
-</section>
\ No newline at end of file
diff --git a/ghost/admin/app/templates/settings/design/index.hbs b/ghost/admin/app/templates/settings/design/index.hbs
deleted file mode 100644
index 46eac344f83..00000000000
--- a/ghost/admin/app/templates/settings/design/index.hbs
+++ /dev/null
@@ -1,43 +0,0 @@
-<section class="gh-canvas gh-design" {{on-key "cmd+s" this.saveFromKeyboard}}>
-    <GhCanvasHeader class="gh-canvas-header">
-        <h2 class="gh-canvas-title">Site design</h2>
-        <section class="view-actions">
-            {{#if (gt this.themeManagement.availablePreviewTypes.length 1)}}
-                <div class="gh-select gh-preview-page-selector">
-                    <OneWaySelect
-                        @value={{this.themeManagement.previewType}}
-                        @options={{this.themeManagement.availablePreviewTypes}}
-                        @optionValuePath="name"
-                        @optionLabelPath="label"
-                        @optionTargetPath="name"
-                        @update={{this.themeManagement.setPreviewType}}
-                    />
-                    {{svg-jar "arrow-down-small"}}
-                </div>
-            {{/if}}
-
-            <div class="gh-contentfilter gh-btn-group">
-                <button type="button" class="gh-btn gh-design-preview-mode {{if this.isDesktopPreview "gh-btn-group-selected"}}" {{on "click" (fn this.setPreviewSize "desktop")}} data-test-button="desktop-preview"><span>{{svg-jar "desktop"}}</span></button>
-                <button type="button" class="gh-btn gh-design-preview-mode {{if this.isMobilePreview "gh-btn-group-selected"}}" {{on "click" (fn this.setPreviewSize "mobile")}} data-test-button="mobile-preview"><span>{{svg-jar "mobile-phone"}}</span></button>
-            </div>
-
-            <GhTaskButton
-                @buttonText="Save"
-                @task={{this.saveTask}}
-                @successText="Saved"
-                @runningText="Saving"
-                @class="gh-btn gh-btn-primary gh-btn-icon"
-                data-test-button="save-settings"
-            />
-        </section>
-    </GhCanvasHeader>
-
-    <div class="view-container">
-        <GhBrowserPreview @isMobilePreview={{this.isMobilePreview}}>
-            <GhHtmlIframe
-                class={{if this.isMobilePreview "gh-post-preview-iframe" "site-frame"}}
-                @html={{this.themeManagement.previewHtml}}
-                @pageId={{this.themeManagement.previewType}} />
-        </GhBrowserPreview>
-    </div>
-</section>
\ No newline at end of file
diff --git a/ghost/admin/app/templates/settings/design/no-theme.hbs b/ghost/admin/app/templates/settings/design/no-theme.hbs
deleted file mode 100644
index e6fafeacf04..00000000000
--- a/ghost/admin/app/templates/settings/design/no-theme.hbs
+++ /dev/null
@@ -1,20 +0,0 @@
-<section class="gh-canvas gh-design">
-    <GhCanvasHeader class="gh-canvas-header">
-        <h2 class="gh-canvas-title">Site design</h2>
-        <section class="view-actions">
-        </section>
-    </GhCanvasHeader>
-    <div class="view-container ">
-        <ol class="posts-list gh-list">
-            <li class="no-posts-box">
-                <div class="no-posts">
-                    <h4>No theme is currently active</h4>
-                    <LinkTo @route="settings.design.change-theme" class="gh-btn">
-                        <span>Activate a theme</span>
-                    </LinkTo>
-                </div>
-            </li>
-        </ol>
-    </div>
-</section>
-{{outlet}}
\ No newline at end of file
diff --git a/ghost/admin/app/templates/settings/general-loading.hbs b/ghost/admin/app/templates/settings/general-loading.hbs
deleted file mode 100644
index df1c78fe4c3..00000000000
--- a/ghost/admin/app/templates/settings/general-loading.hbs
+++ /dev/null
@@ -1,22 +0,0 @@
-<section class="gh-canvas">
-    <GhCanvasHeader class="gh-canvas-header sticky">
-        <div class="flex flex-column">
-            <div class="gh-canvas-breadcrumb">
-                <LinkTo @route="settings">
-                    Settings
-                </LinkTo>
-                {{svg-jar "arrow-right-small"}} General
-            </div>
-            <h2 class="gh-canvas-title" data-test-screen-title>
-                General
-            </h2>
-        </div>
-        <section class="view-actions">
-            <GhTaskButton @buttonText="Save settings" @task={{this.save}} @class="gh-btn gh-btn-primary gh-btn-icon" data-test-button="save" />
-        </section>
-    </GhCanvasHeader>
-
-    <section class="gh-content">
-        <GhLoadingSpinner />
-    </section>
-</section>
diff --git a/ghost/admin/app/templates/settings/general.hbs b/ghost/admin/app/templates/settings/general.hbs
deleted file mode 100644
index 03a1cb6e9ed..00000000000
--- a/ghost/admin/app/templates/settings/general.hbs
+++ /dev/null
@@ -1,441 +0,0 @@
-<section class="gh-canvas" {{on-key "cmd+s" this.saveViaKeyboard}}>
-    <GhCanvasHeader class="gh-canvas-header">
-        <div class="flex flex-column">
-            <div class="gh-canvas-breadcrumb">
-                <LinkTo @route="settings">
-                    Settings
-                </LinkTo>
-                {{svg-jar "arrow-right-small"}} General
-            </div>
-            <h2 class="gh-canvas-title" data-test-screen-title>
-                General
-            </h2>
-        </div>
-        <section class="view-actions">
-            <GhTaskButton @buttonText="Save" @task={{this.saveTask}} @class="gh-btn gh-btn-primary gh-btn-icon" data-test-button="save" />
-        </section>
-    </GhCanvasHeader>
-
-    <div>
-        <div class="gh-main-section">
-            <h4 class="gh-main-section-header small bn">Publication info</h4>
-            <section class="gh-expandable">
-                <div class="gh-expandable-block">
-                    <div class="gh-expandable-header">
-                        <div>
-                            <h4 class="gh-expandable-title">Title &amp; description</h4>
-                            <p class="gh-expandable-description">The details used to identify your publication around the web</p>
-                        </div>
-                        <button type="button" class="gh-btn" {{action (toggle "pubInfoOpen" this)}} data-test-toggle-pub-info><span>{{if this.pubInfoOpen "Close" "Expand"}}</span></button>
-                    </div>
-                    <div class="gh-expandable-content">
-                        {{#liquid-if this.pubInfoOpen}}
-                        <div class="gh-setting-content-extended">
-                            <GhFormGroup @errors={{this.settings.errors}} @hasValidated={{this.settings.hasValidated}} @property="title">
-                                <GhTextInput
-                                    @value={{readonly this.settings.title}}
-                                    @input={{action (mut this.settings.title) value="target.value"}}
-                                    @focus-out={{action "validate" "title" target=this.settings}}
-                                    data-test-title-input={{true}}
-                                />
-                                <GhErrorMessage @errors={{this.settings.errors}} @property="title" />
-                                <p>The name of your site</p>
-                            </GhFormGroup>
-
-                            <GhFormGroup @errors={{this.settings.errors}} @hasValidated={{this.settings.hasValidated}} @property="description" class="description-container">
-                                <GhTextInput
-                                    @value={{readonly this.settings.description}}
-                                    @input={{action (mut this.settings.description) value="target.value"}}
-                                    @focus-out={{action "validate" "description" target=this.settings}}
-                                    data-test-description-input={{true}}
-                                />
-                                <GhErrorMessage @errors={{this.settings.errors}} @property="description"/>
-                                <p>A short description, used in your theme, meta data and search results</p>
-                            </GhFormGroup>
-                        </div>
-                        {{/liquid-if}}
-                    </div>
-                </div>
-
-                <div class="gh-expandable-block">
-                    <div class="gh-expandable-header">
-                        <div>
-                            <h4 class="gh-expandable-title">Site timezone</h4>
-                            <p class="gh-expandable-description">Set the time and date of your publication, used for all published posts</p>
-                        </div>
-                        <button type="button" class="gh-btn" {{action (toggle "timezoneOpen" this)}} data-test-toggle-timezone><span>{{if this.timezoneOpen "Close" "Expand"}}</span></button>
-                    </div>
-                    <div class="gh-expandable-content">
-                        {{#liquid-if this.timezoneOpen}}
-                        <div class="gh-setting-content-extended">
-                            <GhTimezoneSelect
-                                @timezone={{this.settings.timezone}}
-                                @availableTimezones={{this.availableTimezones}}
-                                @update={{action "setTimezone"}} />
-                        </div>
-                        {{/liquid-if}}
-                    </div>
-                </div>
-
-                <div class="gh-expandable-block">
-                    <div class="gh-expandable-header">
-                        <div>
-                            <h4 class="gh-expandable-title">Publication Language</h4>
-                            <p class="gh-expandable-description">Set the language/locale which is used on your site</p>
-                        </div>
-                        <button type="button" class="gh-btn" {{action (toggle "langOpen" this)}} data-test-toggle-lang><span>{{if this.langOpen "Close" "Expand"}}</span></button>
-                    </div>
-                    <div class="gh-expandable-content">
-                        {{#liquid-if this.langOpen}}
-                        <div class="gh-setting-content-extended">
-                            <GhFormGroup @errors={{this.settings.errors}} @hasValidated={{this.settings.hasValidated}} @property="locale">
-                                <GhTextInput
-                                    @value={{readonly this.settings.locale}}
-                                    @input={{action (mut this.settings.locale) value="target.value"}}
-                                    @focus-out={{action "validate" "locale" target=this.settings}}
-                                    data-test-input="locale"
-                                />
-                                <GhErrorMessage @errors={{this.settings.errors}} @property="locale" />
-                                <p>Default: English (<strong>en</strong>); find out more about <a href="https://ghost.org/docs/faq/translation/" target="_blank" rel="noopener noreferrer">using Ghost in other languages</a></p>
-                            </GhFormGroup>
-                        </div>
-                        {{/liquid-if}}
-                    </div>
-                </div>
-            </section>
-        </div>
-
-        <div class="gh-main-section">
-            <h4 class="gh-main-section-header small bn">Site meta settings</h4>
-            <section class="gh-expandable">
-                <div class="gh-expandable-block">
-                    <div class="gh-expandable-header">
-                        <div>
-                            <h4 class="gh-expandable-title">Meta data</h4>
-                            <p class="gh-expandable-description">Extra content for search engines</p>
-                        </div>
-                        <button type="button" class="gh-btn" {{action (toggle "metaDataOpen" this)}} data-test-toggle-meta><span>{{if this.metaDataOpen "Close" "Expand"}}</span></button>
-                    </div>
-                    <div class="gh-expandable-content">
-                        {{#liquid-if this.metaDataOpen}}
-                            <div class="gh-setting-content-extended">
-                                <div class="gh-seo-settings">
-                                    <div class="gh-seo-settings-left flex-basis-1-2-m flex-basis-2-3-l">
-                                        <GhFormGroup @errors={{this.settings.errors}} @hasValidated={{this.settings.hasValidated}} @property="metaTitle">
-                                            <label for="metaTitle">Meta title</label>
-                                            <GhTextInput
-                                                @id="metaTitle"
-                                                @type="text"
-                                                @placeholder={{truncate this.settings.title 70}}
-                                                @value={{readonly this.settings.metaTitle}}
-                                                @input={{action (mut this.settings.metaTitle) value="target.value"}}
-                                                data-test-input="metaTitle"
-                                            />
-                                            <GhErrorMessage @errors={{this.settings.errors}} @property="metaTitle" data-test-error="metaTitle" />
-                                            <p>Recommended: <b>70</b> characters. You’ve used <b>{{gh-count-down-characters this.settings.metaTitle 70}}</b></p>
-                                        </GhFormGroup>
-                                        <GhFormGroup @errors={{this.settings.errors}} @hasValidated={{this.settings.hasValidated}} @property="metaDescription">
-                                            <label for="metaDescription">Meta description</label>
-                                            <GhTextarea
-                                                @id="metaDescription"
-                                                @type="text"
-                                                @placeholder={{truncate this.settings.description 300}}
-                                                @value={{readonly this.settings.metaDescription}}
-                                                @input={{action (mut this.settings.metaDescription) value="target.value"}}
-                                                data-test-input="metaDescription"
-                                            />
-                                            <GhErrorMessage @errors={{this.settings.errors}} @property="metaDescription" data-test-error="metaDescription" />
-                                            <p>Recommended: <b>156</b> characters. You’ve used <b>{{gh-count-down-characters this.settings.metaDescription 156}}</b></p>
-                                        </GhFormGroup>
-                                    </div>
-                                    <div class="flex-basis-1-2-m flex-basis-1-3-l">
-                                        <label>Search engine result preview</label>
-                                        <div class="gh-seo-container">
-                                            <div class="gh-seo-preview">
-                                                <div class="flex mb6">
-                                                    {{svg-jar "google"}}
-                                                    <div class="gh-seo-search-bar">{{svg-jar "google-search"}}</div>
-                                                </div>
-                                                <div class="gh-seo-preview-link">{{this.config.blogDomain}}</div>
-                                                <div class="gh-seo-preview-title">{{or this.settings.metaTitle this.settings.title}}</div>
-                                                <div class="gh-seo-preview-desc">
-                                                    {{truncate (or this.settings.metaDescription this.settings.description) 159}}
-                                                </div>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                        {{/liquid-if}}
-                    </div>
-                </div>
-
-                <div class="gh-expandable-block">
-                    <div class="gh-expandable-header">
-                        <div>
-                            <h4 class="gh-expandable-title">Twitter card</h4>
-                            <p class="gh-expandable-description">Customize structured data of your site for Twitter</p>
-                        </div>
-                        <button type="button" class="gh-btn" {{action (toggle "twitterCardOpen" this)}} data-test-toggle-twitter><span>{{if this.twitterCardOpen "Close" "Expand"}}</span></button>
-                    </div>
-                    <div class="gh-expandable-content">
-                        {{#liquid-if this.twitterCardOpen}}
-                        <div class="gh-setting-content-extended">
-                            <div class="gh-twitter-settings">
-                                <div class="gh-twitter-settings-left flex-basis-1-2-m flex-basis-2-3-l">
-                                    <label>Twitter image</label>
-                                    <GhFormGroup>
-                                        <GhImageUploaderWithPreview
-                                            @image={{this.settings.twitterImage}}
-                                            @text="Add Twitter image"
-                                            @allowUnsplash={{true}}
-                                            @update={{action (mut this.settings.twitterImage)}}
-                                            @remove={{action (mut this.settings.twitterImage) ""}}
-                                        />
-                                    </GhFormGroup>
-                                    <GhFormGroup @errors={{this.settings.errors}} @hasValidated={{this.settings.hasValidated}} @property="twitterTitle">
-                                        <label for="twitterTitle">Twitter title</label>
-                                        <GhTextInput
-                                            @id="twitterTitle"
-                                            @type="text"
-                                            @placeholder={{truncate this.settings.title 70}}
-                                            @value={{readonly this.settings.twitterTitle}}
-                                            @input={{action (mut this.settings.twitterTitle) value="target.value"}}
-                                            data-test-input="twitterTitle"
-                                        />
-                                        <GhErrorMessage @errors={{this.settings.errors}} @property="twitterTitle" data-test-error="twitterTitle" />
-                                    </GhFormGroup>
-                                    <GhFormGroup @errors={{this.settings.errors}} @hasValidated={{this.settings.hasValidated}} @property="twitterDescription">
-                                        <label for="twitterDescription">Twitter description</label>
-                                        <GhTextarea
-                                            @id="twitterDescription"
-                                            @placeholder={{truncate this.settings.description 300}}
-                                            @value={{readonly this.settings.twitterDescription}}
-                                            @input={{action (mut this.settings.twitterDescription) value="target.value"}}
-                                            data-test-input="twitterDescription"
-                                        />
-                                        <GhErrorMessage @errors={{this.settings.errors}} @property="twitterDescription" data-test-error="twitterDescription" />
-                                    </GhFormGroup>
-                                </div>
-                                <div class="flex-basis-1-2-m flex-basis-1-3-l">
-                                    <label>Twitter preview</label>
-                                    <div class="gh-twitter-container">
-                                        <div class="flex ma4">
-                                            <span>{{svg-jar "social-twitter" class="social-icon"}}</span>
-                                            <div class="w-100">
-                                                <span class="gh-social-og-title">{{or this.settings.metaTitle this.settings.title}}</span>
-                                                <span class="gh-social-og-time">12 hrs</span>
-                                                <div class="flex flex-column mt2 mb3">
-                                                    <span class="gh-social-og-desc w-100 mb2" />
-                                                    <span class="gh-social-og-desc w-60" />
-                                                </div>
-                                                <div class="gh-social-twitter-post-preview">
-                                                    {{#if this.settings.twitterImage}}
-                                                        <div class="gh-social-twitter-preview-image" style={{background-image-style this.settings.twitterImage}}></div>
-                                                    {{/if}}
-                                                    <div class="gh-social-twitter-preview-content">
-                                                        <div class="gh-social-twitter-preview-title">{{or this.settings.twitterTitle this.settings.title}}</div>
-                                                        <div class="gh-social-twitter-preview-desc">{{truncate (or this.settings.twitterDescription this.settings.description)}}</div>
-                                                        <div class="gh-social-twitter-preview-meta">
-                                                            {{svg-jar "twitter-link"}}
-                                                            {{this.config.blogDomain}}
-                                                        </div>
-                                                    </div>
-                                                </div>
-                                                <div class="gh-social-twitter-reactions">
-                                                    <div class="flex items-center">{{svg-jar "twitter-comment"}}2</div>
-                                                    <div class="flex items-center">{{svg-jar "twitter-retweet"}}11</div>
-                                                    <div class="flex items-center">{{svg-jar "twitter-like"}}32</div>
-                                                    <div class="flex items-center">{{svg-jar "twitter-share"}}</div>
-                                                </div>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                        {{/liquid-if}}
-                    </div>
-                </div>
-
-                <div class="gh-expandable-block">
-                    <div class="gh-expandable-header">
-                        <div>
-                            <h4 class="gh-expandable-title">Facebook card</h4>
-                            <p class="gh-expandable-description">Customize structured data of your site</p>
-                        </div>
-                        <button type="button" class="gh-btn" {{action (toggle "facebookCardOpen" this)}} data-test-toggle-facebook><span>{{if this.facebookCardOpen "Close" "Expand"}}</span></button>
-                    </div>
-                    <div class="gh-expandable-content">
-                        {{#liquid-if this.facebookCardOpen}}
-                            <div class="gh-setting-content-extended">
-                                <div class="gh-og-settings">
-                                    <div class="gh-og-settings-left flex-basis-1-2-m flex-basis-2-3-l">
-                                        <label>Facebook image</label>
-                                        <GhFormGroup>
-                                            <GhImageUploaderWithPreview
-                                                @image={{this.settings.ogImage}}
-                                                @text="Add Facebook image"
-                                                @allowUnsplash={{true}}
-                                                @update={{action (mut this.settings.ogImage)}}
-                                                @remove={{action (mut this.settings.ogImage) ""}}
-                                            />
-                                        </GhFormGroup>
-                                        <GhFormGroup @errors={{this.settings.errors}} @hasValidated={{this.settings.hasValidated}} @property="ogTitle">
-                                            <label for="ogTitle">Facebook title</label>
-                                            <GhTextInput
-                                                @id="ogTitle"
-                                                @type="text"
-                                                @placeholder={{truncate this.settings.title 70}}
-                                                @value={{readonly this.settings.ogTitle}}
-                                                @input={{action (mut this.settings.ogTitle) value="target.value"}}
-                                                data-test-input="ogTitle"
-                                            />
-                                            <GhErrorMessage @errors={{this.settings.errors}} @property="ogTitle" data-test-error="ogTitle" />
-                                        </GhFormGroup>
-                                        <GhFormGroup @errors={{this.settings.errors}} @hasValidated={{this.settings.hasValidated}} @property="ogDescription">
-                                            <label for="ogDescription">Facebook description</label>
-                                            <GhTextarea
-                                                @id="ogDescription"
-                                                @placeholder={{truncate this.settings.description 300}}
-                                                @value={{readonly this.settings.ogDescription}}
-                                                @input={{action (mut this.settings.ogDescription) value="target.value"}}
-                                                data-test-input="ogDescription"
-                                            />
-                                            <GhErrorMessage @errors={{this.settings.errors}} @property="ogDescription" data-test-error="ogDescription" />
-                                        </GhFormGroup>
-                                    </div>
-                                    <div class="flex-basis-1-2-m flex-basis-1-3-l">
-                                        <label>Facebook preview</label>
-                                        <div class="gh-og-container">
-                                            <div class="flex ma3 mb2">
-                                                <span>{{svg-jar "social-facebook" class="social-icon"}}</span>
-                                                <div>
-                                                    <div class="gh-social-og-title">{{or this.settings.metaTitle this.settings.title}}</div>
-                                                    <div class="gh-social-og-time">12 hrs</div>
-                                                </div>
-                                            </div>
-                                            <div class="flex flex-column ma3 mt2">
-                                                <span class="gh-social-og-desc w-100 mb2" />
-                                                <span class="gh-social-og-desc w-60" />
-                                            </div>
-                                            <div class="gh-social-og-preview">
-                                                {{#if this.settings.ogImage}}
-                                                    <div class="gh-social-og-preview-image" style={{background-image-style this.settings.ogImage}}></div>
-                                                {{/if}}
-                                                <div class="gh-social-og-preview-bookmark">
-                                                    {{!-- Ensures description is hidden if title exceeds one line --}}
-                                                    <div class="gh-social-og-preview-content">
-                                                        <div class="gh-social-og-preview-meta">
-                                                            {{this.config.blogDomain}}
-                                                        </div>
-                                                        <div class="gh-social-og-preview-title">{{truncate (or this.settings.ogTitle this.settings.title)}}</div>
-                                                        <div class="gh-social-og-preview-desc">{{truncate (or this.settings.ogDescription this.settings.description)}}</div>
-                                                    </div>
-                                                </div>
-                                            </div>
-                                            <div class="gh-social-og-reactions">
-                                                <span class="gh-social-og-likes">{{svg-jar "facebook-like" class="z-999"}}{{svg-jar "facebook-heart" class="nl1"}}182</span>
-                                                <span class="gh-social-og-comments">7 comments</span>
-                                                <span class="gh-social-og-comments ml2">2 shares</span>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                        {{/liquid-if}}
-                    </div>
-                </div>
-
-                <div class="gh-expandable-block">
-                    <div class="gh-expandable-header">
-                        <div>
-                            <h4 class="gh-expandable-title">Social accounts</h4>
-                            <p class="gh-expandable-description">Link your social accounts for full structured data and rich card support</p>
-                        </div>
-                        <button type="button" class="gh-btn" {{action (toggle "socialOpen" this)}} data-test-toggle-social><span>{{if this.socialOpen "Close" "Expand"}}</span></button>
-                    </div>
-                    <div class="gh-expandable-content">
-                        {{#liquid-if this.socialOpen}}
-                        <div class="gh-setting-content-extended">
-                            <GhFormGroup @errors={{this.settings.errors}} @hasValidated={{this.settings.hasValidated}} @property="facebook">
-                                <GhFacebookUrlInput
-                                    aria-labelledby="facebook-url-label"
-                                    @scratchValue={{this.scratchValues.facebook}}
-                                    @setScratchValue={{fn this.setScratchValue "facebook"}}
-                                    @model={{this.settings}}
-                                    @modelProperty="facebook"
-                                />
-                                <GhErrorMessage @errors={{this.settings.errors}} @property="facebook" data-test-facebook-error />
-                                <p id="facebook-url-label">URL of your publication's Facebook Page</p>
-                            </GhFormGroup>
-                            <GhFormGroup @errors={{this.settings.errors}} @hasValidated={{this.settings.hasValidated}} @property="twitter">
-                                <GhTwitterUrlInput
-                                    aria-labelledby="twitter-url-label"
-                                    @scratchValue={{this.scratchValues.twitter}}
-                                    @setScratchValue={{fn this.setScratchValue "twitter"}}
-                                    @model={{this.settings}}
-                                    @modelProperty="twitter"
-                                />
-                                <GhErrorMessage @errors={{this.settings.errors}} @property="twitter" data-test-twitter-error />
-                                <p id="twitter-url-label">URL of your publication's Twitter profile</p>
-                            </GhFormGroup>
-                        </div>
-                        {{/liquid-if}}
-                    </div>
-                </div>
-
-            </section>
-        </div>
-
-        <div class="gh-main-section">
-            <h4 class="gh-main-section-header small bn">Advanced settings</h4>
-            <section class="gh-expandable">
-                <div class="gh-expandable-block">
-                    <div class="gh-expandable-header">
-                        <div>
-                            <h4 class="gh-expandable-title">Make this site private</h4>
-                            <p class="gh-expandable-description">
-                                Enable protection with a simple shared password. All search engine optimization and social features will be disabled.
-                            </p>
-                        </div>
-                        <div class="for-switch">
-                            <label class="switch" for="settings-private">
-                                <input
-                                    type="checkbox"
-                                    checked={{this.settings.isPrivate}}
-                                    id="settings-private"
-                                    onclick={{action "toggleIsPrivate" value="target.checked"}}
-                                    data-test-private-checkbox
-                                >
-                                <span class="input-toggle-component"></span>
-                            </label>
-                        </div>
-                    </div>
-                    <div class="gh-expandable-content">
-                        {{#if this.settings.isPrivate}}
-                            <div class="gh-setting-content-extended pt4 pb4">
-                                <span class="avoid-break-out">
-                                    A private RSS feed is available at
-                                    <a href="{{this.privateRSSUrl}}" target="_blank" rel="noopener noreferrer">{{this.privateRSSUrl}}</a>
-                                </span>
-                                <GhFormGroup class="no-margin pt2" @errors={{this.settings.errors}} @hasValidated={{this.settings.hasValidated}} @property="password">
-                                    <GhTextInput
-                                        @value={{readonly this.settings.password}}
-                                        @name="general[password]"
-                                        @focus-out={{action "validate" "password" target=this.settings}}
-                                        @input={{action (mut this.settings.password) value="target.value"}}
-                                        data-test-password-input={{true}}
-                                    />
-                                    <GhErrorMessage @errors={{this.settings.errors}} @property="password" data-test-password-error />
-                                    <p>Set the password for this site</p>
-                                </GhFormGroup>
-                            </div>
-                        {{/if}}
-                    </div>
-                </div>
-            </section>
-        </div>
-    </div>
-</section>
-{{outlet}}
\ No newline at end of file
diff --git a/ghost/admin/app/templates/settings/history.hbs b/ghost/admin/app/templates/settings/history.hbs
deleted file mode 100644
index 958c60a8d73..00000000000
--- a/ghost/admin/app/templates/settings/history.hbs
+++ /dev/null
@@ -1,64 +0,0 @@
-<section class="gh-canvas gh-members-activity">
-    <GhCanvasHeader class="gh-canvas-header">
-        <div class="flex flex-column">
-            {{#if this.userRecord}}
-                <div class="gh-canvas-breadcrumb">
-                    <LinkTo @route="settings">
-                        Settings
-                    </LinkTo>
-                        {{svg-jar "arrow-right-small"}}
-                        <LinkTo @route="settings.history" @query={{reset-query-params "settings.history"}} data-test-link="history-back">
-                            History
-                        </LinkTo>
-                        {{svg-jar "arrow-right-small"}} User
-                </div>
-                <h2 class="gh-canvas-title" data-test-screen-title>
-                    {{or this.userRecord.name this.userRecord.email}}
-                </h2>
-            {{else}}
-                <div class="gh-canvas-breadcrumb">
-                    <LinkTo @route="settings">
-                        Settings
-                    </LinkTo>
-                        {{svg-jar "arrow-right-small"}} History
-                </div>
-                <h2 class="gh-canvas-title" data-test-screen-title>
-                    History
-                </h2>
-            {{/if}}
-        </div>
-        <div class="view-actions">
-            <Settings::History::EventFilter
-                @excludedEvents={{this.excludedEvents}}
-                @excludedResources={{this.excludedResources}}
-                @onChange={{this.changeExcludedItems}} />
-
-            <Settings::History::Search
-                @selected={{this.userRecord}}
-                @onChange={{this.changeUser}} />
-        </div>
-    </GhCanvasHeader>
-    <div class="view-container">
-        {{#let (history-event-fetcher filter=(history-event-filter excludedEvents=this.fullExcludedEvents excludedResources=this.fullExcludedResources user=this.user) pageSize=200) as |eventsFetcher|}}
-            {{#if eventsFetcher.data}}
-            <div class="gh-list-scrolling">
-                <Settings::History::Table @events={{eventsFetcher.data}} />
-
-                {{#if (not (or eventsFetcher.isLoading eventsFetcher.hasReachedEnd))}}
-                    <GhScrollTrigger @enter={{eventsFetcher.loadNextPage}} @triggerOffset={{250}} />
-                {{/if}}
-            </div>
-            {{else}}
-                {{#unless eventsFetcher.isLoading}}
-                    <Settings::History::NoEvents @filter={{or this.user this.excludedResources}} />
-                {{/unless}}
-            {{/if}}
-
-            {{#if eventsFetcher.isLoading}}
-                <div class="no-posts-box"><GhLoadingSpinner /></div>
-            {{/if}}
-        {{/let}}
-    </div>
-</section>
-
-{{outlet}}
diff --git a/ghost/admin/app/templates/settings/integration.hbs b/ghost/admin/app/templates/settings/integration.hbs
deleted file mode 100644
index 5d0158c8c67..00000000000
--- a/ghost/admin/app/templates/settings/integration.hbs
+++ /dev/null
@@ -1,287 +0,0 @@
-<section class="gh-canvas">
-    <form {{on "submit" (perform this.saveTask)}}>
-        <GhCanvasHeader class="gh-canvas-header">
-            <div class="flex flex-column">
-                <div class="gh-canvas-breadcrumb">
-                    <LinkTo @route="settings">
-                        Settings
-                    </LinkTo>
-                    {{svg-jar "arrow-right-small"}}
-                    <LinkTo @route="settings.integrations" data-test-link="integrations-back">
-                        Integrations
-                    </LinkTo>
-                    {{svg-jar "arrow-right-small"}} Edit integration
-                </div>
-                <h2 class="gh-canvas-title" data-test-screen-title>
-                    {{this.integration.name}}
-                </h2>
-            </div>
-            <section class="view-actions">
-                <GhTaskButton @task={{this.saveTask}} @class="gh-btn gh-btn-primary gh-btn-icon" data-test-button="save" />
-            </section>
-        </GhCanvasHeader>
-
-        <div class="gh-main-section" {{scroll-top}}>
-            <h4 class="gh-main-section-header small bn">Configuration</h4>
-            <section class="gh-main-section-block">
-                <div class="gh-main-section-content padding-top-s grey">
-                    <div class="flex">
-                        <div class="flex flex-column items-start app-custom-icon-container">
-                            <label class="mb1">Icon</label>
-                            <figure class="app-custom-icon hide-child" style={{this.iconImageStyle}}>
-                                <AspectRatioBox @class="flex items-center h-100 justify-center" @ratio="1/1" @base="height">
-                                    {{#unless this.integration.iconImage}}
-                                        {{svg-jar "integration" class="w11 h11"}}
-                                    {{/unless}}
-                                </AspectRatioBox>
-
-                                <GhUploader
-                                    @extensions={{this.imageExtensions}}
-                                    @onComplete={{this.setIconImage}}
-                                    as |uploader|
-                                >
-                                    {{#if uploader.isUploading}}
-                                        <div class="absolute top-0 left-0 w-100 h-100 br4 bg-black-70 flex items-center">
-                                            {{uploader.progressBar}}
-                                            </div>
-                                    {{else}}
-                                        <button
-                                            type="button"
-                                            class="child app-custom-icon-uploadlabel"
-                                            {{on "click" this.triggerIconFileDialog}}
-                                        >
-                                            Upload
-                                        </button>
-                                    {{/if}}
-                                    <div style="display:none">
-                                        <GhFileInput
-                                            @name="iconImage"
-                                            @multiple={{false}}
-                                            @action={{uploader.setFiles}}
-                                            @accept={{this.imageMimeTypes}} data-test-file-input="icon" />
-                                    </div>
-                                </GhUploader>
-                            </figure>
-                        </div>
-                        <div class="flex-auto">
-                            <div
-                                class="flex flex-column w-100 mr3"
-                                {{validation-status
-                                    errors=this.integration.errors
-                                    hasValidated=this.integration.hasValidated
-                                    property="name"
-                                }}
-                            >
-                                <label for="integration_name">Name</label>
-                                <GhTextInput
-                                    @id="integration_name"
-                                    @class="gh-input mt1 mb1"
-                                    @type="text"
-                                    @value={{readonly this.integration.name}}
-                                    @on-input={{fn this.updateProperty "name"}}
-                                    @focus-out={{fn this.validateProperty "name"}}
-                                    data-test-input="name"
-                                />
-                                <GhErrorMessage @errors={{this.integration.errors}} @property="name" data-test-error="name" class="ma0" />
-                            </div>
-
-                            <div
-                                class="flex flex-column w-100 mr3"
-                                {{validation-status
-                                    errors=this.integration.errors
-                                    hasValidated=this.integration.hasValidated
-                                    property="description"
-                                }}
-                            >
-                                <label for="integration_description" class="mt3">Description</label>
-                                <GhTextInput
-                                    @id="integration_description"
-                                    @class="gh-input mt1"
-                                    @type="text"
-                                    @value={{readonly this.integration.description}}
-                                    @on-input={{fn this.updateProperty "description"}}
-                                    @focus-out={{fn this.validateProperty "description"}}
-                                    data-test-input="description"
-                                />
-                                <GhErrorMessage @errors={{this.integration.errors}} @property="description" data-test-error="description" class="ma0" />
-                            </div>
-
-                            <table class="app-custom-api-table list" style="table-layout: fixed">
-                                <tbody>
-                                    <tr>
-                                        <td class="data-label">Content API key</td>
-                                        <td class="data highlight-hover">
-                                            <div class="relative flex items-center {{unless this.copyContentKey.isRunning "hide-child-instant"}}">
-                                                <span class="truncate" data-test-text="content-key">
-                                                    {{this.integration.contentKey.secret}}
-                                                </span>
-                                                <div class="app-api-buttons child">
-                                                    <button type="button" {{on "click" (fn this.confirmRegenerateKey this.integration.contentKey)}} class="app-button-regenerate" data-tooltip="Regenerate">
-                                                        {{svg-jar "reload" class="w4 h4 stroke-midgrey"}}
-                                                    </button>
-                                                    <button type="button" {{on "click" (perform this.copyContentKey)}} class="app-button-copy">
-                                                        {{#if this.copyContentKey.isRunning}}
-                                                            {{svg-jar "check-circle" class="w3 v-mid mr2 stroke-white"}} Copied
-                                                        {{else}}
-                                                            Copy
-                                                        {{/if}}
-                                                    </button>
-                                                </div>
-                                            </div>
-                                            {{#if (eq this.regeneratedApiKey.type this.integration.contentKey.type)}}
-                                                <div class="green"> Content API Key was successfully regenerated </div>
-                                            {{/if}}
-                                        </td>
-                                    </tr>
-                                    <tr>
-                                        <td class="data-label">Admin API key</td>
-                                        <td class="data highlight-hover">
-                                            <div class="relative flex items-center {{unless this.copyAdminKey.isRunning "hide-child-instant"}}">
-                                                <span class="truncate" data-test-text="admin-key">
-                                                    {{this.integration.adminKey.secret}}
-                                                </span>
-                                                <div class="app-api-buttons child">
-                                                    <button type="button" {{on "click" (fn this.confirmRegenerateKey this.integration.adminKey)}} class="app-button-regenerate" data-tooltip="Regenerate">
-                                                        {{svg-jar "reload" class="w4 h4 stroke-midgrey"}}
-                                                    </button>
-                                                    <button type="button" {{on "click" (perform this.copyAdminKey)}} class="app-button-copy">
-                                                        {{#if this.copyAdminKey.isRunning}}
-                                                            {{svg-jar "check-circle" class="w3 v-mid mr2 stroke-white"}} Copied
-                                                        {{else}}
-                                                            Copy
-                                                        {{/if}}
-                                                    </button>
-                                                </div>
-                                            </div>
-                                            {{#if (eq this.regeneratedApiKey.type this.integration.adminKey.type)}}
-                                                <div class="green"> Admin API key was successfully regenerated </div>
-                                            {{/if}}
-                                        </td>
-                                    </tr>
-                                    <tr>
-                                        <td class="data-label">API URL</td>
-                                        <td class="data highlight-hover truncate">
-                                            <div class="relative flex items-center {{unless this.copyApiUrl.isRunning "hide-child-instant"}}">
-                                                <span data-test-text="api-url">
-                                                    {{this.apiUrl}}
-                                                </span>
-                                                <div class="app-api-buttons child">
-                                                    <button type="button" {{on "click" (perform this.copyApiUrl)}} class="app-button-copy">
-                                                        {{#if this.copyApiUrl.isRunning}}
-                                                        {{svg-jar "check-circle" class="w3 v-mid mr2 stroke-white"}} Copied
-                                                        {{else}}
-                                                        Copy
-                                                        {{/if}}
-                                                    </button>
-                                                </div>
-                                            </div>
-                                        </td>
-                                    </tr>
-                                </tbody>
-                            </table>
-                        </div>
-                    </div>
-                </div>
-            </section>
-        </div>
-    </form>
-
-    <section class="gh-main-section">
-            <h4 class="gh-main-section-header small">Webhooks</h4>
-            <div class="gh-main-section-block p0">
-            <table class="gh-list small">
-                <thead>
-                    <tr class="gh-list-row header">
-                        <th class="gh-list-header">Name</th>
-                        <th class="gh-list-header">Event</th>
-                        <th class="gh-list-header">URL</th>
-                        <th class="gh-list-header">Last triggered</th>
-                        <th class="gh-list-header"></th>
-                    </tr>
-                </thead>
-                <tbody>
-                    {{#each this.filteredWebhooks as |webhook|}}
-                        <tr class="gh-list-row hide-child" data-test-webhook-row="{{webhook.id}}">
-                            <td class="gh-list-data" data-test-text="name">{{webhook.name}}</td>
-                            <td class="gh-list-data" data-test-text="event">{{event-name webhook.event}}</td>
-                            <td class="gh-list-data" data-test-text="targetUrl">{{webhook.targetUrl}}</td>
-                            <td class="gh-list-data" data-test-text="last-triggered">{{or webhook.lastTriggeredAtUTC "Not triggered"}}</td>
-                            <td class="w1 gh-list-data nowrap">
-                                {{!-- <div class="child flex items-center">
-                                    <LinkTo @route="settings.integration.webhooks.edit" @models={{array this.integration webhook}} data-test-link="edit-webhook">
-                                        {{svg-jar "pen" class="w6 h6 fill-midgrey pa1 mr1"}}
-                                    </LinkTo>
-                                    <button data-test-button="delete-webhook" type="button" {{on "click" (fn this.confirmWebhookDeletion webhook)}}>
-                                        {{svg-jar "trash" class="w6 fill-red pa1"}}
-                                    </button>
-                                </div> --}}
-                                <GhBasicDropdown @verticalPosition="below" @horizontalPosition="right" @renderInPlace={{true}} as |dd|>
-                                    <dd.Trigger class="gh-btn gh-btn-action-icon gh-btn-icon gh-btn-outline fill gh-tier-card-actions-button icon-only">
-                                        <span data-test-newsletter-menu-trigger>
-                                            {{svg-jar "dotdotdot"}}
-                                            <span class="hidden">Actions</span>
-                                        </span>
-                                    </dd.Trigger>
-                                    <dd.Content class="relative-dropdown-menu gh-newsletter-actions-menu">
-                                        <ul class="dropdown-menu dropdown-triangle-top-right" role="listbox" {{css-transition "anim-fade-in-scale"}}>
-                                            <li>
-                                                <LinkTo @route="settings.integration.webhooks.edit" @models={{array this.integration webhook}} data-test-link="edit-webhook">
-                                                    Edit
-                                                </LinkTo>
-                                            </li>
-                                            <li>
-                                                <button data-test-button="delete-webhook" type="button" {{on "click" (fn this.confirmWebhookDeletion webhook)}}>
-                                                    Delete
-                                                </button>
-                                            </li>
-                                        </ul>
-                                    </dd.Content>
-                                </GhBasicDropdown>
-                            </td>
-                        </tr>
-                    {{else}}
-                    <tr class="bt b--whitegrey" data-test-webhooks-blank-slate>
-                        <td colspan="5" class="pa5 pt15 pb15 tc midgrey f7">
-                            <div class="flex flex-column items-center">
-                                <p class="ma0 pa0 tc midgrey lh-title mb2">
-                                    No webhooks configured
-                                </p>
-                                <LinkTo @route="settings.integration.webhooks.new" @model={{this.integration}} class="flex items-center" data-test-link="add-webhook">
-                                <div class="gh-btn-text green-d1 gh-btn-icon">
-                                    {{svg-jar "plus"}}
-                                    <span>Add webhook</span>
-                                </div>
-                                </LinkTo>
-                            </div>
-                        </td>
-                    </tr>
-                    {{/each}}
-                </tbody>
-                {{#if this.filteredWebhooks}}
-                <tfoot>
-                    <tr class="gh-list-row new-webhook-cell">
-                        <td colspan="5" class="gh-list-data">
-                            <LinkTo @route="settings.integration.webhooks.new" @model={{this.integration}} class="flex items-center" data-test-link="add-webhook">
-                            <div class="gh-btn-text green-d1 gh-btn-icon">
-                                {{svg-jar "plus"}}
-                                <span class="f7">Add webhook</span>
-                            </div>
-                            </LinkTo>
-                        </td>
-                    </tr>
-                </tfoot>
-                {{/if}}
-            </table>
-        </div>
-    </section>
-
-    <section class="gh-main-section">
-        <div class="gh-main-section-block">
-            <button class="gh-btn gh-btn-red gh-btn-icon" type="button" {{on "click" this.confirmIntegrationDeletion}} data-test-button="delete-integration">
-                <span> Delete integration </span>
-            </button>
-        </div>
-    </section>
-</section>
-
-{{outlet}}
diff --git a/ghost/admin/app/templates/settings/integrations.hbs b/ghost/admin/app/templates/settings/integrations.hbs
deleted file mode 100644
index 957c7c62afd..00000000000
--- a/ghost/admin/app/templates/settings/integrations.hbs
+++ /dev/null
@@ -1,295 +0,0 @@
-<section class="gh-canvas">
-    <GhCanvasHeader class="gh-canvas-header">
-        <div class="flex flex-column">
-            <div class="gh-canvas-breadcrumb">
-                <LinkTo @route="settings">
-                    Settings
-                </LinkTo>
-                {{svg-jar "arrow-right-small"}} Integrations
-            </div>
-            <h2 class="gh-canvas-title" data-test-screen-title>
-                Integrations
-            </h2>
-        </div>
-    </GhCanvasHeader>
-
-    <div class="gh-main-section" {{scroll-top}}>
-        <div class="integrations-directory">
-            <a class="id-item" href="https://ghost.org/integrations/disqus/" target="_blank" rel="noopener noreferrer">
-                <div class="id-item-logo id-disqus">
-                    <img class="w-100 h-100" style="object-fit:contain;" src="assets/img/disqus.svg" alt="Disqus Icon" />
-                </div>
-                <div class="f8 mt1">Disqus</div>
-            </a>
-            <a class="id-item" href="https://ghost.org/integrations/google/" target="_blank" rel="noopener noreferrer">
-                <div class="id-item-logo id-analytics">
-                    <img class="w-100 h-100" style="object-fit:contain;padding:1px 0;" src="assets/img/google-analytics.png" alt="Google Analytics Icon" />
-                </div>
-                <div class="f8 mt1">Analytics</div>
-            </a>
-            <a class="id-item" href="https://ghost.org/integrations/ulysses/" target="_blank" rel="noopener noreferrer">
-                <div class="id-item-logo id-ulysses">
-                    <img class="w-100 h-100" style="object-fit:contain;" src="assets/img/ulysses.png" alt="Ulysses Icon" />
-                </div>
-                <div class="f8 mt1">Ulysses</div>
-            </a>
-            <a class="id-item" href="https://ghost.org/integrations/typeform/" target="_blank" rel="noopener noreferrer">
-                <div class="id-item-logo id-typeform">
-                    <img class="w-100 h-100" style="object-fit:contain;" src="assets/img/typeform.svg" alt="Typeform Icon" />
-                </div>
-                <div class="f8 mt1">Typeform</div>
-            </a>
-            <a class="id-item" href="https://ghost.org/integrations/buffer/" target="_blank" rel="noopener noreferrer">
-                <div class="id-item-logo id-buffer">
-                    <img class="w-100 h-100" style="object-fit:contain;padding:1px 0;" src="assets/img/buffer.png" alt="Buffer Icon" />
-                </div>
-                <div class="f8 mt1">Buffer</div>
-            </a>
-            <a class="id-item" href="https://ghost.org/integrations/plausible/" target="_blank" rel="noopener noreferrer">
-                <div class="id-item-logo id-plausible">
-                    <img class="w-100 h-100" style="object-fit:contain;padding:1px 0;" src="assets/img/plausible.png" alt="Plausible Icon" />
-                </div>
-                <div class="f8 mt1">Plausible</div>
-            </a>
-            <a class="id-item" href="https://ghost.org/integrations/github/" target="_blank" rel="noopener noreferrer">
-                <div class="id-item-logo id-github">
-                    <img class="w-100 h-100" style="object-fit:contain;" src="assets/img/github.svg" alt="GitHub Icon" />
-                </div>
-                <div class="f8 mt1">GitHub</div>
-            </a>
-            <a class="id-item" href="https://ghost.org/integrations/" target="_blank" rel="noopener noreferrer">
-                <div class="id-item-logo id-more">
-                    {{svg-jar "circle-ellipsis" class="w5"}}
-                </div>
-                <div class="f8 mt1">More</div>
-            </a>
-        </div>
-    </div>
-
-    <section class="gh-main-section">
-        <h4 class="gh-main-section-header small">Built-in integrations</h4>
-        <div class="apps-grid">
-            {{#if this.zapierDisabled}}
-            <div class="apps-grid-cell" data-test-app="zapier">
-                <LinkTo @route="pro">
-                <article class="apps-card-app apps-card-app-disabled">
-                    <div class="apps-card-left">
-                        <figure class="apps-card-app-icon" style="background-image:url(assets/img/zapier.svg);background-size:36px"></figure>
-                        <div class="apps-card-meta">
-                            <div class="apps-card-app-title-container"><h3 class="apps-card-app-title">Zapier</h3>{{svg-jar "lock-filled"}}</div>
-                            <p class="apps-card-app-desc">Automation for your favorite apps</p>
-                        </div>
-                    </div>
-                    <div class="gh-card-right">
-                        <div class="apps-configured">
-                            <button type="button" class="apps-card-app-disabled-cta">Upgrade</button>
-                        </div>
-                    </div>
-                </article>
-                </LinkTo>
-            </div>
-            {{else}}
-            <div class="apps-grid-cell" data-test-app="zapier">
-                <LinkTo @route="settings.integrations.zapier" data-test-link="zapier">
-                <article class="apps-card-app">
-                    <div class="apps-card-left">
-                        <figure class="apps-card-app-icon" style="background-image:url(assets/img/zapier.svg);background-size:36px;"></figure>
-                        <div class="apps-card-meta">
-                            <h3 class="apps-card-app-title">Zapier</h3>
-                            <p class="apps-card-app-desc">Automation for your favorite apps</p>
-                        </div>
-                    </div>
-                    <div class="gh-card-right">
-                        <div class="apps-configured">
-                            <span data-test-app-status>Configure</span>
-                            {{svg-jar "arrow-right"}}
-                        </div>
-                    </div>
-                </article>
-                </LinkTo>
-            </div>
-            {{/if}}
-
-            <div class="apps-grid-cell" data-test-app="slack">
-                <LinkTo @route="settings.integrations.slack" data-test-link="slack">
-                <article class="apps-card-app">
-                    <div class="apps-card-left">
-                        <figure class="apps-card-app-icon" style="background-image:url(assets/img/slackicon.png); background-size: 36px;"></figure>
-                        <div class="apps-card-meta">
-                            <h3 class="apps-card-app-title">Slack</h3>
-                            <p class="apps-card-app-desc">A messaging app for teams</p>
-                        </div>
-                    </div>
-                    <div class="gh-card-right">
-                        <div class="apps-configured">
-                            {{#if this.settings.slack.isActive}}
-                                <span class="gh-badge" data-test-app-status>Active</span>
-                            {{else}}
-                                <span data-test-app-status>Configure</span>
-                            {{/if}}
-                            {{svg-jar "arrow-right"}}
-                        </div>
-                    </div>
-                </article>
-                </LinkTo>
-            </div>
-
-            <div class="apps-grid-cell" data-test-app="amp">
-                <LinkTo @route="settings.integrations.amp" data-test-link="amp">
-                <article class="apps-card-app">
-                    <div class="apps-card-left">
-                        <figure class="apps-card-app-icon" style="background-image:url(assets/img/amp.svg); background-size: 36px;"></figure>
-                        <div class="apps-card-meta">
-                            <h3 class="apps-card-app-title">AMP</h3>
-                            <p class="apps-card-app-desc">Google Accelerated Mobile Pages</p>
-                        </div>
-                    </div>
-                    <div class="gh-card-right">
-                        <div class="apps-configured">
-                            {{#if this.settings.amp}}
-                                <span class="gh-badge" data-test-app-status>Active</span>
-                            {{else}}
-                                <span data-test-app-status>Configure</span>
-                            {{/if}}
-                            {{svg-jar "arrow-right"}}
-                        </div>
-                    </div>
-                </article>
-                </LinkTo>
-            </div>
-
-            <div class="apps-grid-cell" data-test-app="unsplash">
-                <LinkTo @route="settings.integrations.unsplash" data-test-link="unsplash">
-                <article class="apps-card-app">
-                    <div class="apps-card-left">
-                        <figure class="apps-card-app-icon id-unsplash" style="background-image:url(assets/img/unsplash.svg); background-size:30px;"></figure>
-                        <div class="apps-card-meta">
-                            <h3 class="apps-card-app-title">Unsplash</h3>
-                            <p class="apps-card-app-desc">Beautiful, free photos</p>
-                        </div>
-                    </div>
-                    <div class="gh-card-right">
-                        <div class="apps-configured">
-                            {{#if this.settings.unsplash}}
-                                <span class="gh-badge" data-test-app-status>Active</span>
-                            {{else}}
-                                <span data-test-app-status>Configure</span>
-                            {{/if}}
-                            {{svg-jar "arrow-right"}}
-                        </div>
-                    </div>
-                </article>
-                </LinkTo>
-            </div>
-            <div class="apps-grid-cell" data-test-app="firstpromoter">
-                <LinkTo @route="settings.integrations.firstpromoter" data-test-link="firstpromoter">
-                <article class="apps-card-app">
-                    <div class="apps-card-left">
-                        <figure class="apps-card-app-icon id-unsplash" style="background-image:url(assets/img/firstpromoter.png); background-size:36px;"></figure>
-                        <div class="apps-card-meta">
-                            <h3 class="apps-card-app-title">FirstPromoter</h3>
-                            <p class="apps-card-app-desc">Launch your member referral program</p>
-                        </div>
-                    </div>
-                    <div class="gh-card-right">
-                        <div class="apps-configured">
-                            {{#if this.settings.firstpromoter}}
-                                <span class="gh-badge" data-test-app-status>Active</span>
-                            {{else}}
-                                <span data-test-app-status>Configure</span>
-                            {{/if}}
-                            {{svg-jar "arrow-right"}}
-                        </div>
-                    </div>
-                </article>
-                </LinkTo>
-            </div>
-            <div class="apps-grid-cell" data-test-app="pintura">
-                <LinkTo @route="settings.integrations.pintura" data-test-link="pintura">
-                <article class="apps-card-app">
-                    <div class="apps-card-left">
-                        <figure class="apps-card-app-icon id-unsplash" style="background-image:url(assets/img/pintura.png); background-size:36px;"></figure>
-                        <div class="apps-card-meta">
-                            <h3 class="apps-card-app-title">Pintura</h3>
-                            <p class="apps-card-app-desc">Advanced image editing</p>
-                        </div>
-                    </div>
-                    <div class="gh-card-right">
-                        <div class="apps-configured">
-                            {{#if this.settings.firstpromoter}}
-                                <span class="gh-badge" data-test-app-status>Active</span>
-                            {{else}}
-                                <span data-test-app-status>Configure</span>
-                            {{/if}}
-                            {{svg-jar "arrow-right"}}
-                        </div>
-                    </div>
-                </article>
-                </LinkTo>
-            </div>
-        </div>
-    </section>
-
-    <section class="gh-main-section">
-        <h4 class="gh-main-section-header small">Custom integrations</h4>
-        <div class="apps-grid">
-            {{#each this.integrations as |integration|}}
-                <div class="apps-grid-cell" data-test-custom-integration>
-                    <LinkTo @route="settings.integration" @model={{integration}} data-test-integration={{integration.id}}>
-                        <article class="apps-card-app">
-                            <div class="apps-card-left">
-                                <figure class="apps-card-app-icon flex items-center" style={{integration-icon-style integration}}>
-                                    {{#unless integration.iconImage}}
-                                        {{svg-jar "integration" class="nudge-left--6 w9 stroke-darkgrey"}}
-                                    {{/unless}}
-                                </figure>
-                                <div class="apps-card-meta">
-                                    <h3 class="apps-card-app-title" data-test-text="name">
-                                        {{integration.name}}
-                                    </h3>
-                                    <p class="apps-card-app-desc" data-test-text="description">
-                                        {{integration.description}}
-                                    </p>
-                                </div>
-                            </div>
-                            <div class="gh-card-right">
-                                <div class="apps-configured">
-                                    <span>Configure</span>
-                                    {{svg-jar "arrow-right"}}
-                                </div>
-                            </div>
-                        </article>
-                    </LinkTo>
-                </div>
-            {{else}}
-                <div class="flex flex-column justify-center items-center mih30 miw-100 bb b--whitegrey" data-test-blank="custom-integrations">
-                    {{#if this.fetchIntegrations.isRunning}}
-                        <div class="gh-loading-spinner"></div>
-                    {{else}}
-                        <div class="flex flex-column items-center pa5 pt15 pb15">
-                            <p class="ma0 pa0 tc midgrey lh-title mt2 mb4">
-                                Create your own custom Ghost integrations with dedicated API keys & webhooks
-                            </p>
-                            <LinkTo @route="settings.integrations.new" class="gh-btn gh-btn-green gh-btn-icon" data-test-button="new-integration">
-                                <span>{{svg-jar "plus"}} Add custom integration</span>
-                            </LinkTo>
-                        </div>
-                    {{/if}}
-                </div>
-            {{/each}}
-        </div>
-
-        {{#if this.integrations}}
-        {{!-- <div class="apps-grid-cell new-integration-cell"> --}}
-        <div class="mt5">
-            <LinkTo @route="settings.integrations.new" class="gh-btn gh-btn-green gh-btn-icon" data-test-button="new-integration">
-                <span>{{svg-jar "plus"}} Add custom integration</span>
-            </LinkTo>
-        </div>
-        {{!-- </div> --}}
-        {{/if}}
-    </section>
-
-</section>
-
-{{outlet}}
diff --git a/ghost/admin/app/templates/settings/integrations/amp-loading.hbs b/ghost/admin/app/templates/settings/integrations/amp-loading.hbs
deleted file mode 100644
index a1075403fda..00000000000
--- a/ghost/admin/app/templates/settings/integrations/amp-loading.hbs
+++ /dev/null
@@ -1,21 +0,0 @@
-<section class="gh-canvas">
-    <GhCanvasHeader class="gh-canvas-header">
-        <div class="flex flex-column">
-            <div class="gh-canvas-breadcrumb">
-                <LinkTo @route="settings">
-                    Settings
-                </LinkTo>
-                {{svg-jar "arrow-right-small"}}
-                <LinkTo @route="settings.integrations" data-test-link="integrations-back">
-                    Integrations
-                </LinkTo>
-                {{svg-jar "arrow-right-small"}} AMP
-            </div>
-        </div>
-        <section class="view-actions"></section>
-    </GhCanvasHeader>
-
-    <div class="gh-content">
-        <GhLoadingSpinner />
-    </div>
-</section>
\ No newline at end of file
diff --git a/ghost/admin/app/templates/settings/integrations/amp.hbs b/ghost/admin/app/templates/settings/integrations/amp.hbs
deleted file mode 100644
index 9a1fc3385f7..00000000000
--- a/ghost/admin/app/templates/settings/integrations/amp.hbs
+++ /dev/null
@@ -1,85 +0,0 @@
-<section class="gh-canvas">
-    <GhCanvasHeader class="gh-canvas-header sticky">
-        <div class="flex flex-column">
-            <div class="gh-canvas-breadcrumb">
-                <LinkTo @route="settings">
-                    Settings
-                </LinkTo>
-                {{svg-jar "arrow-right-small"}}
-                <LinkTo @route="settings.integrations" data-test-link="integrations-back">
-                    Integrations
-                </LinkTo>
-                {{svg-jar "arrow-right-small"}} AMP
-            </div>
-        </div>
-        <section class="view-actions">
-            <GhTaskButton @task={{this.saveTask}} @class="gh-btn gh-btn-primary gh-btn-icon" data-test-save-button={{true}} />
-        </section>
-    </GhCanvasHeader>
-
-    <section class="view-container">
-        <section class="gh-main-section app-grid">
-            <div class="gh-main-section-block app-detail-heading app-grid">
-                <div class="app-cell">
-                    <img class="app-icon" src="assets/img/amp.svg" />
-                </div>
-                <div class="app-cell">
-                    <h3>AMP</h3>
-                    <p>Accelerated Mobile Pages</p>
-                </div>
-            </div>
-        </section>
-
-        <div class="gh-main-section">
-            <h4 class="gh-main-section-header small bn">AMP configuration</h4>
-            <section class="gh-main-section-block">
-                <div class="gh-main-section-content grey">
-                    <div>
-                        <div class="gh-setting-first {{unless this.settings.amp "gh-setting-last"}}">
-                            <div class="gh-setting-content">
-                                <div class="gh-setting-title">Enable AMP</div>
-                                <div class="gh-setting-desc mb0">Enable <a href="https://ampproject.org" target="_blank" rel="noopener noreferrer">Google Accelerated Mobile Pages</a> for your posts</div>
-                            </div>
-                            <div class="gh-setting-action">
-                                <div class="for-checkbox">
-                                    <label for="amp" class="checkbox">
-                                        <input
-                                            type="checkbox"
-                                            checked={{this.settings.amp}}
-                                            id="amp"
-                                            name="amp"
-                                            onclick={{action "update" value="target.checked"}}
-                                            data-test-amp-checkbox
-                                        >
-                                        <span class="input-toggle-component"></span>
-                                    </label>
-                                </div>
-                            </div>
-                        </div>
-                        {{#liquid-if this.settings.amp class=""}}
-                        <div class="gh-setting-last gh-setting-amp-liquid">
-                            <div class="gh-setting-content gh-setting-content--no-action">
-                                <div class="gh-setting-title">Google Analytics Tracking ID</div>
-                                <div class="gh-setting-desc">Tracks AMP traffic in Google Analytics, find your ID <a href="https://ghost.org/help/how-to-find-your-google-analytics-tracking-id/">here</a></div>
-                                <div class="gh-setting-content-extended">
-                                    <GhFormGroup class="no-margin" @errors={{this.settings.errors}} @hasValidated={{this.settings.hasValidated}} @property="ampGtagId">
-                                        <GhTextInput
-                                            @placeholder="UA-XXXXXXX-X"
-                                            @name="amp_gtag_id"
-                                            @value={{this.settings.ampGtagId}}
-                                            @keyEvents={{hash
-                                                Enter=(action "save")
-                                            }}
-                                        />
-                                        <GhErrorMessage @errors={{this.settings.errors}} @property="ampGtagId"/>
-                                    </GhFormGroup>
-                                </div>
-                            </div>
-                        </div>
-                        {{/liquid-if}}
-                    </div>
-                </div>
-            </section>
-        </div>
-    </section>
-</section>
diff --git a/ghost/admin/app/templates/settings/integrations/firstpromoter.hbs b/ghost/admin/app/templates/settings/integrations/firstpromoter.hbs
deleted file mode 100644
index 53bc9bf21e8..00000000000
--- a/ghost/admin/app/templates/settings/integrations/firstpromoter.hbs
+++ /dev/null
@@ -1,85 +0,0 @@
-<section class="gh-canvas">
-    <GhCanvasHeader class="gh-canvas-header sticky">
-        <div class="flex flex-column">
-            <div class="gh-canvas-breadcrumb">
-                <LinkTo @route="settings">
-                    Settings
-                </LinkTo>
-                {{svg-jar "arrow-right-small"}}
-                <LinkTo @route="settings.integrations" data-test-link="integrations-back">
-                    Integrations
-                </LinkTo>
-                {{svg-jar "arrow-right-small"}} FirstPromoter
-            </div>
-        </div>
-        <section class="view-actions">
-            <GhTaskButton @task={{this.saveTask}} @class="gh-btn gh-btn-primary gh-btn-icon" data-test-save-button={{true}} />
-        </section>
-    </GhCanvasHeader>
-
-    <section class="view-container">
-        <section class="gh-main-section app-grid">
-            <div class="gh-main-section-block app-detail-heading app-grid">
-                <div class="app-cell">
-                    <img class="app-icon" src="assets/img/firstpromoter.png" />
-                </div>
-                <div class="app-cell">
-                    <h3>FirstPromoter</h3>
-                    <p>Launch your own member referral program</p>
-                </div>
-            </div>
-        </section>
-
-        <div class="gh-main-section">
-        <h4 class="gh-main-section-header small bn">FirstPromoter configuration</h4>
-        <section class="gh-main-section-block">
-            <div class="gh-main-section-content grey">
-                <div>
-                    <div class="gh-setting-first {{unless this.settings.firstpromoter "gh-setting-last"}}">
-                        <div class="gh-setting-content">
-                            <div class="gh-setting-title">Enable FirstPromoter</div>
-                            <div class="gh-setting-desc mb0">Enable <a href="https://firstpromoter.com/?fpr=ghost&fp_sid=admin" target="_blank" rel="noopener noreferrer">FirstPromoter</a> for tracking referrals</div>
-                        </div>
-                        <div class="gh-setting-action">
-                            <div class="for-checkbox">
-                                <label for="firstpromoter" class="checkbox">
-                                    <input
-                                        type="checkbox"
-                                        checked={{this.settings.firstpromoter}}
-                                        id="firstpromoter"
-                                        name="firstpromoter"
-                                        onclick={{action "update" value="target.checked"}}
-                                        data-test-firstpromoter-checkbox
-                                    >
-                                    <span class="input-toggle-component"></span>
-                                </label>
-                            </div>
-                        </div>
-                    </div>
-                    {{#liquid-if this.settings.firstpromoter class=""}}
-                    <div class="gh-setting-last gh-setting-firstpromoter-liquid">
-                        <div class="gh-setting-content gh-setting-content--no-action">
-                            <div class="gh-setting-title">FirstPromoter Account ID</div>
-                            <div class="gh-setting-desc"> Affiliate and referral tracking, find your ID <a href="https://ghost.org/help/firstpromoter-id/">here</a></div>
-                            <div class="gh-setting-content-extended">
-                                <GhFormGroup class="no-margin" @errors={{this.settings.errors}} @hasValidated={{this.settings.hasValidated}} @property="firstpromoterId">
-                                    <GhTextInput
-                                        @placeholder="XXXXXXXX"
-                                        @name="firstpromoter_id"
-                                        @value={{this.settings.firstpromoterId}}
-                                        @keyEvents={{hash
-                                            Enter=(action "save")
-                                        }}
-                                    />
-                                    <GhErrorMessage @errors={{this.settings.errors}} @property="firstpromoterId"/>
-                                </GhFormGroup>
-                            </div>
-                        </div>
-                    </div>
-                    {{/liquid-if}}
-                </div>
-            </div>
-        </section>
-        </div>
-    </section>
-</section>
diff --git a/ghost/admin/app/templates/settings/integrations/pintura.hbs b/ghost/admin/app/templates/settings/integrations/pintura.hbs
deleted file mode 100644
index 5f3c362d929..00000000000
--- a/ghost/admin/app/templates/settings/integrations/pintura.hbs
+++ /dev/null
@@ -1,175 +0,0 @@
-<section class="gh-canvas">
-    <GhCanvasHeader class="gh-canvas-header sticky">
-        <div class="flex flex-column">
-            <div class="gh-canvas-breadcrumb">
-                <LinkTo @route="settings">
-                    Settings
-                </LinkTo>
-                {{svg-jar "arrow-right-small"}}
-                <LinkTo @route="settings.integrations" data-test-link="integrations-back">
-                    Integrations
-                </LinkTo>
-                {{svg-jar "arrow-right-small"}} Pintura
-            </div>
-        </div>
-        <section class="view-actions">
-            <GhTaskButton @task={{this.saveTask}} @class="gh-btn gh-btn-primary gh-btn-icon" data-test-save-button={{true}} />
-        </section>
-    </GhCanvasHeader>
-
-    <section class="view-container">
-        <section class="gh-main-section app-grid">
-            <div class="gh-main-section-block app-detail-heading app-grid">
-                <div class="app-cell">
-                    <img class="app-icon" src="assets/img/pintura.png" alt="Pintura icon"/>
-                </div>
-                <div class="app-cell">
-                    <h3>Pintura</h3>
-                    <p>Advanced image editing</p>
-                </div>
-            </div>
-        </section>
-        {{#unless this.config.pintura}}
-        <div class="gh-main-section">
-            <div class="gh-pintura-banner gh-main-section-content grey">
-                <div class="gh-pintura-banner-content">
-                    <strong>Add advanced image editing to Ghost, with Pintura</strong>
-                    <p>Pintura is a powerful JavaScript image editor that allows you to crop, rotate, annotate and modify images directly inside Ghost.</p>
-                    <p>Try a demo, purchase a license, and download the required CSS/JS files from pqina.nl/pintura/ to activate this feature.</p>
-                    <button type="button" class="gh-btn gh-btn-primary"><span>Find out more →</span></button>
-                </div>
-                <img class="gh-pintura-banner-image" src="assets/img/pintura-screenshot.png" alt="Pintura banner">
-            </div>
-        </div>
-        {{/unless}}
-
-
-        <div class="gh-main-section">
-        <h4 class="gh-main-section-header small bn">Pintura configuration</h4>
-        <section class="gh-main-section-block">
-            <div class="gh-main-section-content grey">
-                <div>
-                    <div class="gh-setting-first {{unless this.showUploadSettings "gh-setting-last"}}">
-                        <div class="gh-setting-content">
-                            <div class="gh-setting-title">Enable Pintura</div>
-                            <div class="gh-setting-desc mb0">Enable <a href="https://pqina.nl/pintura/?ref=ghost.org" target="_blank" rel="noopener noreferrer">Pintura</a> for editing your images in Ghost</div>
-                        </div>
-                        <div class="gh-setting-action">
-                            <div class="for-checkbox">
-                                <label for="pintura" class="checkbox">
-                                    <input
-                                        type="checkbox"
-                                        checked={{this.settings.pintura}}
-                                        id="pintura"
-                                        name="pintura"
-                                        {{on "click" this.update}}
-                                        {{!-- onclick={{action "update" value="target.checked"}} --}}
-                                        data-test-pintura-checkbox
-                                    >
-                                    <span class="input-toggle-component"></span>
-                                </label>
-                            </div>
-                        </div>
-                    </div>
-                    {{#unless this.config.pintura}}
-                        {{#liquid-if this.settings.pintura class=""}}
-                        <div class="gh-setting-last gh-setting-firstpromoter-liquid">
-                            <GhUploader
-                                @extensions={{this.jsExtension}}
-                                @uploadUrl="/files/upload/"
-                                @resourceName="files"
-                                @onComplete={{fn this.fileUploadCompleted 'js'}}
-                                as |uploader|
-                            >
-                                <div class="gh-expandable-header">
-                                    <div>
-                                        <h4 class="gh-expandable-title">Upload Pintura script</h4>
-                                        <p class="gh-expandable-description">Upload the <code>pintura-umd.js</code> file from the Pintura package</p>
-                                    </div>
-                                    <div class="gh-setting-action flex flex-column items-end">
-                                        {{#if uploader.isUploading}}
-                                            {{uploader.progressBar}}
-                                        {{else}}
-                                            <button
-                                                type="button"
-                                                class="gh-btn gh-btn-icon {{if this.jsSuccess "gh-btn-green"}} {{if this.jsFailure "gh-btn-red"}}"
-                                                onclick={{this.triggerFileDialog}}
-                                                data-test-button="upload-pintura-js"
-                                            >
-                                                <span>
-                                                    {{#if this.jsSuccess}}
-                                                        {{svg-jar "check-circle"}} Uploaded
-                                                    {{else if this.jsFailure}}
-                                                        {{svg-jar "retry"}} Upload Failed
-                                                    {{else}}
-                                                        Upload
-                                                    {{/if}}
-                                                </span>
-                                            </button>
-                                        {{/if}}
-
-                                        {{#each uploader.errors as |error|}}
-                                            <div class="gh-setting-error" data-test-error="pintura">{{or error.context error.message}}</div>
-                                        {{/each}}
-
-                                        <div style="display:none">
-                                            <GhFileInput @multiple={{false}} @action={{uploader.setFiles}} @accept={{this.jsAccept}} data-test-file-input="pintura" />
-                                        </div>
-                                    </div>
-                                </div>
-                            </GhUploader>
-                        </div>
-                        <div class="gh-setting-last gh-setting-firstpromoter-liquid">
-                            <GhUploader
-                                @extensions={{this.cssExtension}}
-                                @uploadUrl="/files/upload/"
-                                @resourceName="files"
-                                @onComplete={{fn this.fileUploadCompleted 'css'}}
-                                as |uploader|
-                            >
-                                <div class="gh-expandable-header">
-                                    <div>
-                                        <h4 class="gh-expandable-title">Upload Pintura styles</h4>
-                                        <p class="gh-expandable-description">Upload the <code>pintura.css</code> file from the Pintura package</p>
-                                    </div>
-                                    <div class="gh-setting-action flex flex-column items-end">
-                                        {{#if uploader.isUploading}}
-                                            {{uploader.progressBar}}
-                                        {{else}}
-                                            <button
-                                                type="button"
-                                                class="gh-btn gh-btn-icon {{if this.cssSuccess "gh-btn-green"}} {{if this.cssFailure "gh-btn-red"}}"
-                                                onclick={{this.triggerFileDialog}}
-                                                data-test-button="upload-pintura-css"
-                                            >
-                                                <span>
-                                                    {{#if this.cssSuccess}}
-                                                        {{svg-jar "check-circle"}} Uploaded
-                                                    {{else if this.cssFailure}}
-                                                        {{svg-jar "retry"}} Upload Failed
-                                                    {{else}}
-                                                        Upload
-                                                    {{/if}}
-                                                </span>
-                                            </button>
-                                        {{/if}}
-
-                                        {{#each uploader.errors as |error|}}
-                                            <div class="gh-setting-error" data-test-error="routes">{{or error.context error.message}}</div>
-                                        {{/each}}
-
-                                        <div style="display:none">
-                                            <GhFileInput @multiple={{false}} @action={{uploader.setFiles}} @accept={{this.cssAccept}} data-test-file-input="pintura" />
-                                        </div>
-                                    </div>
-                                </div>
-                            </GhUploader>
-                        </div>
-                        {{/liquid-if}}
-                    {{/unless}}
-                </div>
-            </div>
-        </section>
-        </div>
-    </section>
-</section>
diff --git a/ghost/admin/app/templates/settings/integrations/slack-loading.hbs b/ghost/admin/app/templates/settings/integrations/slack-loading.hbs
deleted file mode 100644
index f1fce17a88f..00000000000
--- a/ghost/admin/app/templates/settings/integrations/slack-loading.hbs
+++ /dev/null
@@ -1,21 +0,0 @@
-<section class="gh-canvas">
-    <GhCanvasHeader class="gh-canvas-header">
-        <div class="flex flex-column">
-            <div class="gh-canvas-breadcrumb">
-                <LinkTo @route="settings">
-                    Settings
-                </LinkTo>
-                {{svg-jar "arrow-right-small"}}
-                <LinkTo @route="settings.integrations" data-test-link="integrations-back">
-                    Integrations
-                </LinkTo>
-                {{svg-jar "arrow-right-small"}} Slack
-            </div>
-        </div>
-        <section class="view-actions"></section>
-    </GhCanvasHeader>
-
-    <div class="gh-content">
-        <GhLoadingSpinner />
-    </div>
-</section>
\ No newline at end of file
diff --git a/ghost/admin/app/templates/settings/integrations/slack.hbs b/ghost/admin/app/templates/settings/integrations/slack.hbs
deleted file mode 100644
index e12eb33fe86..00000000000
--- a/ghost/admin/app/templates/settings/integrations/slack.hbs
+++ /dev/null
@@ -1,96 +0,0 @@
-<section class="gh-canvas">
-    <GhCanvasHeader class="gh-canvas-header sticky">
-        <div class="flex flex-column">
-            <div class="gh-canvas-breadcrumb">
-                <LinkTo @route="settings">
-                    Settings
-                </LinkTo>
-                {{svg-jar "arrow-right-small"}}
-                <LinkTo @route="settings.integrations" data-test-link="integrations-back">
-                    Integrations
-                </LinkTo>
-                {{svg-jar "arrow-right-small"}} Slack
-            </div>
-        </div>
-        <section class="view-actions">
-            <GhTaskButton @task={{this.saveTask}} @class="gh-btn gh-btn-primary gh-btn-icon" data-test-save-button={{true}} />
-        </section>
-    </GhCanvasHeader>
-
-    <section class="view-container">
-        <section class="gh-main-section app-grid">
-            <div class="gh-main-section-block app-detail-heading app-grid">
-                <div class="app-cell">
-                    <img class="app-icon" src="assets/img/slackicon.png" />
-                </div>
-                <div class="app-cell">
-                    <h3>Slack</h3>
-                    <p>A messaging app for teams</p>
-                </div>
-            </div>
-        </section>
-
-        <section class="gh-main-section">
-            <h4 class="gh-main-section-header small bn">Slack configuration</h4>
-            <div class="gh-main-section-block">
-                <div class="gh-main-section-content grey">
-                    <form class="app-config-form" id="slack-settings" novalidate="novalidate" {{action "save" on="submit"}}>
-
-                        <div class="gh-main-section-block">
-                            <div class="gh-setting-first">
-                                <div class="gh-setting-content gh-setting-content--no-action">
-                                    <div class="gh-setting-title">Webhook URL</div>
-                                    <div class="gh-setting-desc">Automatically send newly published posts to a channel in Slack or any Slack-compatible service like Discord or Mattermost.</div>
-                                    <div class="gh-setting-content-extended">
-                                        <GhFormGroup @errors={{this.settings.errors}} @hasValidated={{this.settings.hasValidated}} @property="slackUrl">
-                                            <GhTextInput
-                                                @placeholder="https://hooks.slack.com/services/..."
-                                                @name="slack_url"
-                                                @value={{readonly this.settings.slackUrl}}
-                                                @input={{action (mut this.settings.slackUrl) value="target.value"}}
-                                                @focus-out={{action "validate" "slackUrl" target=this.settings}}
-                                                @keyEvents={{hash
-                                                    Enter=(action "save")
-                                                }}
-                                                data-test-slack-url-input={{true}}
-                                            />
-                                            {{#if this.settings.errors}}
-                                                <GhErrorMessage @errors={{this.settings.errors}} @property="slackUrl" data-test-error="slack-url" />
-                                            {{else}}
-                                                <p>Set up a new incoming webhook <a href="https://my.slack.com/apps/new/A0F7XDUAZ-incoming-webhooks" target="_blank" rel="noopener noreferrer">here</a>, and grab the URL.</p>
-                                            {{/if}}
-                                        </GhFormGroup>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="gh-setting-last">
-                                <div class="gh-setting-content gh-setting-content--no-action">
-                                    <div class="gh-setting-title">Username</div>
-                                    <div class="gh-setting-desc">The username to display messages from</div>
-                                    <div class="gh-setting-content-extended">
-                                        <GhFormGroup @errors={{this.settings.errors}} @hasValidated={{this.settings.hasValidated}} @property="username">
-                                            <GhTextInput
-                                                @placeholder="Ghost"
-                                                @name="slack_username"
-                                                @value={{readonly this.settings.slackUsername}}
-                                                @input={{action (mut this.settings.slackUsername) value="target.value"}}
-                                                @keyEvents={{hash
-                                                    Enter=(action "save")
-                                                }}
-                                                data-test-slack-username-input={{true}}
-                                            />
-                                            {{#if this.settings.errors}}
-                                                <GhErrorMessage @errors={{this.settings.errors}} @property="slackUsername" />
-                                            {{/if}}
-                                        </GhFormGroup>
-                                    </div>
-                                    <GhTaskButton @buttonText="Send test notification" @task={{this.sendTestNotification}} @successText="Sent" @class="gh-btn gh-btn-icon" @disabled={{this.testNotificationDisabled}} data-test-send-notification-button="true" />
-                                </div>
-                            </div>
-                        </div>
-                    </form>
-                </div>
-            </div>
-        </section>
-    </section>
-</section>
diff --git a/ghost/admin/app/templates/settings/integrations/unsplash-loading.hbs b/ghost/admin/app/templates/settings/integrations/unsplash-loading.hbs
deleted file mode 100644
index ce1b6f38178..00000000000
--- a/ghost/admin/app/templates/settings/integrations/unsplash-loading.hbs
+++ /dev/null
@@ -1,21 +0,0 @@
-<section class="gh-canvas">
-    <GhCanvasHeader class="gh-canvas-header">
-        <div class="flex flex-column">
-            <div class="gh-canvas-breadcrumb">
-                <LinkTo @route="settings">
-                    Settings
-                </LinkTo>
-                {{svg-jar "arrow-right-small"}}
-                <LinkTo @route="settings.integrations" data-test-link="integrations-back">
-                    Integrations
-                </LinkTo>
-                {{svg-jar "arrow-right-small"}} Unsplash
-            </div>
-        </div>
-        <section class="view-actions"></section>
-    </GhCanvasHeader>
-
-    <div class="gh-content">
-        <GhLoadingSpinner />
-    </div>
-</section>
\ No newline at end of file
diff --git a/ghost/admin/app/templates/settings/integrations/unsplash.hbs b/ghost/admin/app/templates/settings/integrations/unsplash.hbs
deleted file mode 100644
index d4c16e919a5..00000000000
--- a/ghost/admin/app/templates/settings/integrations/unsplash.hbs
+++ /dev/null
@@ -1,64 +0,0 @@
-<section class="gh-canvas">
-    <GhCanvasHeader class="gh-canvas-header sticky">
-        <div class="flex flex-column">
-            <div class="gh-canvas-breadcrumb">
-                <LinkTo @route="settings">
-                    Settings
-                </LinkTo>
-                {{svg-jar "arrow-right-small"}}
-                <LinkTo @route="settings.integrations" data-test-link="integrations-back">
-                    Integrations
-                </LinkTo>
-                {{svg-jar "arrow-right-small"}} Unsplash
-            </div>
-        </div>
-        <section class="view-actions">
-            <GhTaskButton @task={{this.saveTask}} @class="gh-btn gh-btn-primary gh-btn-icon" data-test-save-button={{true}} />
-        </section>
-    </GhCanvasHeader>
-
-    <section class="view-container">
-        <section class="gh-main-section app-grid">
-            <div class="gh-main-section-block app-detail-heading app-grid">
-                <div class="app-cell">
-                    <img class="app-icon pa2 id-unsplash" src="assets/img/unsplash.svg" alt="Unsplash" />
-                </div>
-                <div class="app-cell">
-                    <h3>Unsplash</h3>
-                    <p>Beautiful, free photos</p>
-                </div>
-            </div>
-        </section>
-
-        <section class="gh-main-section">
-            <h4 class="gh-main-section-header small bn">Unsplash configuration</h4>
-            <div class="gh-main-section-block">
-                <div class="gh-main-section-content grey">
-                    <div class="gh-setting-first gh-setting-last" id="unsplash-toggle">
-                        <div class="gh-setting-content">
-                            <div class="gh-setting-title">Enable Unsplash</div>
-                            <div class="gh-setting-desc mb0">Enable <a href="https://unsplash.com" target="_blank" rel="noopener noreferrer">Unsplash</a> image integration for your posts</div>
-                        </div>
-                        <div class="gh-setting-action">
-                            <div class="form-group right gh-setting-unsplash-checkbox">
-                                <div class="for-checkbox">
-                                    <label for="unsplash" class="checkbox">
-                                            <input
-                                                type="checkbox"
-                                                checked={{this.settings.unsplash}}
-                                                id="unsplash"
-                                                name="unsplash"
-                                                onclick={{action "update" value="target.checked"}}
-                                                data-test-unsplash-checkbox
-                                            >
-                                            <span class="input-toggle-component"></span>
-                                    </label>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </section>
-    </section>
-</section>
diff --git a/ghost/admin/app/templates/settings/integrations/zapier.hbs b/ghost/admin/app/templates/settings/integrations/zapier.hbs
deleted file mode 100644
index 55a7f3df193..00000000000
--- a/ghost/admin/app/templates/settings/integrations/zapier.hbs
+++ /dev/null
@@ -1,249 +0,0 @@
-<section class="gh-canvas">
-    <GhCanvasHeader class="gh-canvas-header sticky">
-        <div class="flex flex-column">
-            <div class="gh-canvas-breadcrumb">
-                <LinkTo @route="settings">
-                    Settings
-                </LinkTo>
-                {{svg-jar "arrow-right-small"}}
-                <LinkTo @route="settings.integrations" data-test-link="integrations-back">
-                    Integrations
-                </LinkTo>
-                {{svg-jar "arrow-right-small"}} Zapier
-            </div>
-        </div>
-    </GhCanvasHeader>
-
-    <section class="view-container">
-
-        <section class="gh-main-section no-heading">
-            <div class="gh-main-section-block overflow-hidden">
-                <div class="gh-main-section-content app-detail-heading app-grid">
-                    <div class="app-cell">
-                        <img class="app-icon" src="assets/img/zapier.svg" alt="" role="presentation" />
-                    </div>
-                    <div class="app-cell overflow-hidden">
-                        <h3>Zapier</h3>
-                        <p>Automation for your favorite apps</p>
-
-                        <div class="gh-zapier-data-container">
-                            <div class="gh-zapier-data">
-                                <div class="data-label">Admin API key</div>
-                                <div class="data highlight-hover">
-                                    <div class="relative flex items-center {{unless this.copyAdminKeyTask.isRunning "hide-child-instant"}}">
-                                        <span class="admin-key" data-test-text="admin-key">
-                                            {{this.integration.adminKey.secret}}
-                                        </span>
-                                        <div class="app-api-buttons child">
-                                            <button type="button" {{on "click" (fn this.confirmRegenerateKey this.integration.adminKey)}} class="app-button-regenerate">
-                                                {{svg-jar "reload" class="w4 h4 stroke-midgrey"}}
-                                            </button>
-                                            <button type="button" {{on "click" (perform this.copyAdminKeyTask)}} class="app-button-copy">
-                                                {{#if this.copyAdminKeyTask.isRunning}}
-                                                    {{svg-jar "check-circle" class="w3 v-mid mr2 stroke-white"}} Copied
-                                                {{else}}
-                                                    Copy
-                                                {{/if}}
-                                            </button>
-                                        </div>
-                                    </div>
-                                    {{#if (eq this.regeneratedApiKey.type this.integration.adminKey.type)}}
-                                        <div class="green"> Admin API Key was successfully regenerated </div>
-                                    {{/if}}
-                                </div>
-                            </div>
-                            <div class="gh-zapier-data">
-                                <div class="data-label">API URL</div>
-                                <div class="data highlight-hover">
-                                    <div class="relative flex items-center {{unless this.copyApiUrlTask.isRunning "hide-child-instant"}}">
-                                        <span class="api-url" data-test-text="api-url">
-                                            {{this.apiUrl}}
-                                        </span>
-                                        <div class="app-api-buttons child">
-                                            <button type="button" {{on "click" (perform this.copyApiUrlTask)}} class="app-button-copy">
-                                                {{#if this.copyApiUrlTask.isRunning}}
-                                                    {{svg-jar "check-circle" class="w3 v-mid mr2 stroke-white"}} Copied
-                                                {{else}}
-                                                    Copy
-                                                {{/if}}
-                                            </button>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </section>
-
-        <section id="zapier-toggle" class="gh-main-section">
-            <h4 class="gh-main-section-header large bn">Zapier templates</h4>
-            <p class="gh-main-section-description">Explore pre-built templates for common automation tasks</p>
-            <div class="gh-setting-content gh-setting-content--no-action">
-                <div class="gh-setting-content-extended">
-                    <div class="apps-grid gh-settings-zapier-templates">
-                        <div class="apps-grid-cell">
-                            <article class="apps-card-app">
-                                <div class="apps-card-left">
-                                    <div class="flex items-center">
-                                        <figure class="apps-card-app-orb" style="background-image:url(assets/img/logos/orb-black-1.png);background-size:32px;"></figure>
-                                        {{svg-jar "arrow-right" class="fill-midgrey w4 ml2"}}
-                                        <figure class="apps-card-app-icon" style="background-image:url(assets/img/twitter.svg);background-size:32px;"></figure>
-                                    </div>
-                                    <div class="apps-card-meta">
-                                        <h3 class="apps-card-app-title">Share new posts to Twitter</h3>
-                                    </div>
-                                </div>
-                                <div class="gh-card-right">
-                                    <a href="https://zapier.com/webintent/create-zap?template=50909" target="_blank" rel="noopener noreferrer" class="gh-btn gh-btn-outline zapier-template-link"><span>Use this Zap</span></a>
-                                </div>
-                            </article>
-                        </div>
-                        <div class="apps-grid-cell">
-                            <article class="apps-card-app">
-                                <div class="apps-card-left">
-                                    <div class="flex items-center">
-                                        <figure class="apps-card-app-orb" style="background-image:url(assets/img/logos/orb-black-2.png);background-size:32px;"></figure>
-                                        {{svg-jar "arrow-right" class="fill-midgrey w4 ml2"}}
-                                        <figure class="apps-card-app-icon" style="background-image:url(assets/img/slackicon.png);background-size:30px;"></figure>
-                                    </div>
-                                    <div class="apps-card-meta">
-                                        <h3 class="apps-card-app-title">Share scheduled posts with your team in Slack</h3>
-                                    </div>
-                                </div>
-                                <div class="gh-card-right">
-                                    <a href="https://zapier.com/webintent/create-zap?template=359499" target="_blank" rel="noopener noreferrer" class="gh-btn gh-btn-outline zapier-template-link"><span>Use this Zap</span></a>
-                                </div>
-                            </article>
-                        </div>
-                        <div class="apps-grid-cell">
-                            <article class="apps-card-app">
-                                <div class="apps-card-left">
-                                    <div class="flex items-center">
-                                        <figure class="apps-card-app-orb" style="background-image:url(assets/img/logos/orb-black-3.png);background-size:32px;"></figure>
-                                        {{svg-jar "arrow-right" class="fill-midgrey w4 ml2"}}
-                                        <figure class="apps-card-app-icon" style="background-image:url(assets/img/patreon.svg);background-size:28px;"></figure>
-                                    </div>
-                                    <div class="apps-card-meta">
-                                        <h3 class="apps-card-app-title">Connect Patreon to your Ghost membership site</h3>
-                                    </div>
-                                </div>
-                                <div class="gh-card-right">
-                                    <a href="https://zapier.com/webintent/create-zap?template=75801" target="_blank" rel="noopener noreferrer" class="gh-btn gh-btn-outline zapier-template-link"><span>Use this Zap</span></a>
-                                </div>
-                            </article>
-                        </div>
-                        <div class="apps-grid-cell">
-                            <article class="apps-card-app">
-                                <div class="apps-card-left">
-                                    <div class="flex items-center">
-                                        <figure class="apps-card-app-orb" style="background-image:url(assets/img/logos/orb-black-4.png);background-size:32px;"></figure>
-                                        {{svg-jar "arrow-right" class="fill-midgrey w4 ml2"}}
-                                        <figure class="apps-card-app-icon" style="background-image:url(assets/img/zero-bounce.png);background-size:30px;"></figure>
-                                    </div>
-                                    <div class="apps-card-meta">
-                                        <h3 class="apps-card-app-title">Protect email delivery with email verification</h3>
-                                    </div>
-                                </div>
-                                <div class="gh-card-right">
-                                    <a href="https://zapier.com/webintent/create-zap?template=359415" target="_blank" rel="noopener noreferrer" class="gh-btn gh-btn-outline zapier-template-link"><span>Use this Zap</span></a>
-                                </div>
-                            </article>
-                        </div>
-                        <div class="apps-grid-cell">
-                            <article class="apps-card-app">
-                                <div class="apps-card-left">
-                                    <div class="flex items-center">
-                                        <figure class="apps-card-app-orb" style="background-image:url(assets/img/logos/orb-black-5.png);background-size:32px;"></figure>
-                                        {{svg-jar "arrow-right" class="fill-midgrey w4 ml2"}}
-                                        <figure class="apps-card-app-icon" style="background-image:url(assets/img/paypal.svg);background-size:26px;"></figure>
-                                    </div>
-                                    <div class="apps-card-meta">
-                                        <h3 class="apps-card-app-title">Add members for successful sales in PayPal</h3>
-                                    </div>
-                                </div>
-                                <div class="gh-card-right">
-                                    <a href="https://zapier.com/webintent/create-zap?template=184423" target="_blank" rel="noopener noreferrer" class="gh-btn gh-btn-outline zapier-template-link"><span>Use this Zap</span></a>
-                                </div>
-                            </article>
-                        </div>
-                        <div class="apps-grid-cell">
-                            <article class="apps-card-app">
-                                <div class="apps-card-left">
-                                    <div class="flex items-center">
-                                        <figure class="apps-card-app-orb rot-1" style="background-image:url(assets/img/logos/orb-black-3.png);background-size:32px;"></figure>
-                                        {{svg-jar "arrow-right" class="fill-midgrey w4 ml2"}}
-                                        <figure class="apps-card-app-icon" style="background-image:url(assets/img/paypal.svg);background-size:26px;"></figure>
-                                    </div>
-                                    <div class="apps-card-meta">
-                                        <h3 class="apps-card-app-title">Unsubscribe members who cancel a subscription in PayPal</h3>
-                                    </div>
-                                </div>
-                                <div class="gh-card-right">
-                                    <a href="https://zapier.com/webintent/create-zap?template=359348" target="_blank" rel="noopener noreferrer" class="gh-btn gh-btn-outline zapier-template-link"><span>Use this Zap</span></a>
-                                </div>
-                            </article>
-                        </div>
-                        <div class="apps-grid-cell">
-                            <article class="apps-card-app">
-                                <div class="apps-card-left">
-                                    <div class="flex items-center">
-                                        <figure class="apps-card-app-orb rot-2" style="background-image:url(assets/img/logos/orb-black-1.png);background-size:32px;"></figure>
-                                        {{svg-jar "arrow-right" class="fill-midgrey w4 ml2"}}
-                                        <figure class="apps-card-app-icon" style="background-image:url(assets/img/google-docs.svg);background-size:22px;"></figure>
-                                    </div>
-                                    <div class="apps-card-meta">
-                                        <h3 class="apps-card-app-title">Send new post drafts from Google Docs to Ghost</h3>
-                                    </div>
-                                </div>
-                                <div class="gh-card-right">
-                                    <a href="https://zapier.com/webintent/create-zap?template=50924" target="_blank" rel="noopener noreferrer" class="gh-btn gh-btn-outline zapier-template-link"><span>Use this Zap</span></a>
-                                </div>
-                            </article>
-                        </div>
-                        <div class="apps-grid-cell">
-                            <article class="apps-card-app">
-                                <div class="apps-card-left">
-                                    <div class="flex items-center">
-                                        <figure class="apps-card-app-orb rot-3" style="background-image:url(assets/img/logos/orb-black-4.png);background-size:32px;"></figure>
-                                        {{svg-jar "arrow-right" class="fill-midgrey w4 ml2"}}
-                                        <figure class="apps-card-app-icon id-typeform" style="background-image:url(assets/img/typeform.svg);background-size:32px;"></figure>
-                                    </div>
-                                    <div class="apps-card-meta">
-                                        <h3 class="apps-card-app-title">Survey new members using Typeform</h3>
-                                    </div>
-                                </div>
-                                <div class="gh-card-right">
-                                    <a href="https://zapier.com/webintent/create-zap?template=359407" target="_blank" rel="noopener noreferrer" class="gh-btn gh-btn-outline zapier-template-link"><span>Use this Zap</span></a>
-                                </div>
-                            </article>
-                        </div>
-                        <div class="apps-grid-cell">
-                            <article class="apps-card-app">
-                                <div class="apps-card-left">
-                                    <div class="flex items-center">
-                                        <figure class="apps-card-app-orb rot-3" style="background-image:url(assets/img/logos/orb-black-1.png);background-size:32px;"></figure>
-                                        {{svg-jar "arrow-right" class="fill-midgrey w4 ml2"}}
-                                        <figure class="apps-card-app-icon" style="background-image:url(assets/img/mailchimp.svg);background-size:32px;"></figure>
-                                    </div>
-                                    <div class="apps-card-meta">
-                                        <h3 class="apps-card-app-title">Sync email subscribers in Ghost + Mailchimp</h3>
-                                    </div>
-                                </div>
-                                <div class="gh-card-right">
-                                    <a href="https://zapier.com/webintent/create-zap?template=359342" target="_blank" rel="noopener noreferrer" class="gh-btn gh-btn-outline zapier-template-link"><span>Use this Zap</span></a>
-                                </div>
-                            </article>
-                        </div>
-                    </div>
-
-                    <div class="zapier-footer">
-                        <a href="https://zapier.com/apps/ghost/integrations?utm_medium=partner_api&utm_source=widget&utm_campaign=Widget" target="_blank" rel="noopener noreferrer"><span>View more Ghost integrations powered by</span> <figure style="background-image:url(assets/img/zapier-logo.svg); background-size: 42px;"></figure></a>
-                    </div>
-
-                </div>
-            </div>
-        </section>
-    </section>
-</section>
diff --git a/ghost/admin/app/templates/settings/labs-loading.hbs b/ghost/admin/app/templates/settings/labs-loading.hbs
deleted file mode 100644
index cb38236f14e..00000000000
--- a/ghost/admin/app/templates/settings/labs-loading.hbs
+++ /dev/null
@@ -1,19 +0,0 @@
-<section class="gh-canvas">
-    <GhCanvasHeader class="gh-canvas-header">
-        <div class="flex flex-column">
-            <div class="gh-canvas-breadcrumb">
-                <LinkTo @route="settings">
-                    Settings
-                </LinkTo>
-                {{svg-jar "arrow-right-small"}} Labs
-            </div>
-            <h2 class="gh-canvas-title" data-test-screen-title>
-                Labs
-            </h2>
-        </div>
-    </GhCanvasHeader>
-
-    <div class="gh-content">
-        <GhLoadingSpinner />
-    </div>
-</section>
diff --git a/ghost/admin/app/templates/settings/labs.hbs b/ghost/admin/app/templates/settings/labs.hbs
deleted file mode 100644
index 46dbf086fc8..00000000000
--- a/ghost/admin/app/templates/settings/labs.hbs
+++ /dev/null
@@ -1,358 +0,0 @@
-<section class="gh-canvas">
-    <GhCanvasHeader class="gh-canvas-header">
-        <div class="flex flex-column">
-            <div class="gh-canvas-breadcrumb">
-                <LinkTo @route="settings">
-                    Settings
-                </LinkTo>
-                {{svg-jar "arrow-right-small"}} Labs
-            </div>
-            <h2 class="gh-canvas-title" data-test-screen-title>
-                Labs
-            </h2>
-        </div>
-    </GhCanvasHeader>
-
-    <section class="view-container settings-debug">
-        <p class="gh-box gh-box-tip">{{svg-jar "idea"}}This is a testing ground for new or experimental features. They may change, break or inexplicably disappear at any time.</p>
-
-        <div class="gh-main-section">
-            <h4 class="gh-main-section-header small bn">Migration options</h4>
-            <div class="gh-expandable {{if this.importErrors "overflow-hidden"}}">
-                <div class="gh-expandable-block">
-                    <div class="gh-expandable-header">
-                        <div>
-                            <h4 class="gh-expandable-title">Import content</h4>
-                            <p class="gh-expandable-description">Import posts from a JSON or zip file</p>
-                        </div>
-                        <LinkTo @route="settings.labs.import" class="gh-btn" data-test-link="import-content">
-                            <span>Open Importer</span>
-                        </LinkTo>
-                    </div>
-                </div>
-
-                <div class="gh-expandable-block">
-                    <div class="gh-expandable-header">
-                        <div>
-                            <h4 class="gh-expandable-title">Export your content</h4>
-                            <p class="gh-expandable-description">Download all of your posts and settings in a single, glorious JSON file</p>
-                        </div>
-                        <button type="button" class="gh-btn" {{action "downloadFile" "db"}}><span>Export</span></button>
-                    </div>
-                </div>
-
-                <div class="gh-expandable-block">
-                    <div class="gh-expandable-header">
-                        <div>
-                            <h4 class="gh-expandable-title">Delete all content</h4>
-                            <p class="gh-expandable-description">Permanently delete all posts and tags from the database, a hard reset</p>
-                        </div>
-                        <button type="button" class="gh-btn gh-btn-red" {{on "click" this.confirmDeleteAll}} data-test-button="delete-all"><span>Delete</span></button>
-                    </div>
-                </div>
-            </div>
-        </div>
-
-        <div class="gh-main-section">
-            <h4 class="gh-main-section-header small bn">Beta features</h4>
-            <div class="gh-expandable">
-
-                <div class="gh-expandable-block">
-                    <div class="gh-expandable-header">
-                        <div>
-                            <h4 class="gh-expandable-title">Substack migrator</h4>
-                            <p class="gh-expandable-description">A <a href="https://ghost.org/help/importing-from-substack/" target="_blank" rel="noopener noreferrer">step-by-step tool</a> to easily import all your content, members and paid subscriptions</p>
-                        </div>
-                        <LinkTo @route="migrate" class="gh-btn" data-test-link="migrate">
-                            <span>Open</span>
-                        </LinkTo>
-                    </div>
-                </div>
-
-                <div class="gh-expandable-block">
-                    <div class="gh-expandable-header">
-                        <div>
-                            <h4 class="gh-expandable-title">Portal translation</h4>
-                            <p class="gh-expandable-description">
-                                Translate your membership flows into your publication language (<a href="https://github.com/TryGhost/Ghost/tree/main/ghost/i18n/locales" target="_blank" rel="noopener noreferrer">supported languages</a>). Don’t see yours? <a href="https://forum.ghost.org/t/help-translate-ghost-beta/37461" target="_blank" rel="noopener noreferrer">Get involved</a>
-                            </p>
-                        </div>
-                        <div class="for-switch">
-                            <GhFeatureFlag @flag="i18n" />
-                        </div>
-                    </div>
-                </div>
-
-                <div class="gh-expandable-block">
-                    <GhUploader
-                        @extensions={{this.redirectsFileExtensions}}
-                        @uploadUrl="/redirects/upload/"
-                        @paramName="redirects"
-                        @onUploadSuccess={{perform this.redirectUploadResult true}}
-                        @onUploadFailure={{perform this.redirectUploadResult false}}
-                        as |uploader|
-                    >
-                    <div class="gh-expandable-header">
-                        <div>
-                            <h4 class="gh-expandable-title">Redirects</h4>
-                            <p class="gh-expandable-description">Configure redirects for old or moved content, more info in <a href="https://ghost.org/tutorials/implementing-redirects/" target="_blank" rel="noopener noreferrer">the docs</a></p>
-                        </div>
-                        <div class="gh-setting-action flex flex-column items-end">
-                            {{#if uploader.isUploading}}
-                                {{uploader.progressBar}}
-                            {{else}}
-                                <button
-                                    type="button"
-                                    class="gh-btn gh-btn-icon {{if this.redirectSuccess "gh-btn-green"}} {{if this.redirectFailure "gh-btn-red"}}"
-                                    onclick={{action "triggerFileDialog"}}
-                                    data-test-button="upload-redirects"
-                                >
-                                    <span>
-                                        {{#if this.redirectSuccess}}
-                                            {{svg-jar "check-circle"}} Uploaded
-                                        {{else if this.redirectFailure}}
-                                            {{svg-jar "retry"}} Upload Failed
-                                        {{else}}
-                                            Upload redirects YAML/JSON
-                                        {{/if}}
-                                    </span>
-                                </button>
-                                <div><a href="#" {{action "downloadFile" "redirects/download"}} data-test-link="download-redirects">Download current redirects</a></div>
-                            {{/if}}
-
-                            {{#each uploader.errors as |error|}}
-                                <div class="gh-setting-error" data-test-error="redirects">{{or error.context error.message}}</div>
-                            {{/each}}
-
-                            <div style="display:none">
-                                <GhFileInput @multiple={{false}} @action={{uploader.setFiles}} @accept={{this.redirectsFileMimeTypes}} data-test-file-input="redirects" />
-                            </div>
-                        </div>
-                    </div>
-                    </GhUploader>
-                </div>
-
-                <div class="gh-expandable-block">
-                    <GhUploader
-                        @extensions={{this.yamlExtension}}
-                        @uploadUrl="/settings/routes/yaml/"
-                        @paramName="routes"
-                        @onUploadSuccess={{perform this.routesUploadResult true}}
-                        @onUploadFailure={{perform this.routesUploadResult false}}
-                        as |uploader|
-                    >
-                    <div class="gh-expandable-header">
-                        <div>
-                            <h4 class="gh-expandable-title">Routes</h4>
-                            <p class="gh-expandable-description">Configure dynamic routing by modifying the routes.yaml file</p>
-                        </div>
-                        <div class="gh-setting-action flex flex-column items-end">
-                            {{#if uploader.isUploading}}
-                                {{uploader.progressBar}}
-                            {{else}}
-                                <button
-                                    type="button"
-                                    class="gh-btn gh-btn-icon {{if this.routesSuccess "gh-btn-green"}} {{if this.routesFailure "gh-btn-red"}}"
-                                    onclick={{action "triggerFileDialog"}}
-                                    data-test-button="upload-routes"
-                                >
-                                    <span>
-                                        {{#if this.routesSuccess}}
-                                            {{svg-jar "check-circle"}} Uploaded
-                                        {{else if this.routesFailure}}
-                                            {{svg-jar "retry"}} Upload Failed
-                                        {{else}}
-                                            Upload routes YAML
-                                        {{/if}}
-                                    </span>
-                                </button>
-                                <div><a href="#" {{action "downloadFile" "settings/routes/yaml"}} data-test-link="download-routes">Download current routes.yaml</a></div>
-                            {{/if}}
-
-                            {{#each uploader.errors as |error|}}
-                                <div class="gh-setting-error" data-test-error="routes">{{or error.context error.message}}</div>
-                            {{/each}}
-
-                            <div style="display:none">
-                                <GhFileInput @multiple={{false}} @action={{uploader.setFiles}} @accept={{this.yamlAccept}} data-test-file-input="routes" />
-                            </div>
-                        </div>
-                    </div>
-                    </GhUploader>
-                </div>
-            </div>
-        </div>
-
-
-        {{#if (enable-developer-experiments)}}
-         <div class="gh-main-section">
-            <h4 class="gh-main-section-header small bn">Alpha Features</h4>
-            <div class="gh-expandable">
-                <div class="gh-expandable-block">
-                    <div class="gh-expandable-header">
-                        <div>
-                            <h4 class="gh-expandable-title">URL cache</h4>
-                            <p class="gh-expandable-description">
-                               Enable URL Caching
-                            </p>
-                        </div>
-                        <div class="for-switch">
-                           <GhFeatureFlag @flag="urlCache" />
-                        </div>
-                    </div>
-                </div>
-
-                <div class="gh-expandable-block">
-                    <div class="gh-expandable-header">
-                        <div>
-                            <h4 class="gh-expandable-title">Lexical multiplayer</h4>
-                            <p class="gh-expandable-description">
-                                Enables multiplayer editing in the lexical editor.
-                            </p>
-                        </div>
-                        <div class="for-switch">
-                            <GhFeatureFlag @flag="lexicalMultiplayer" />
-                        </div>
-                    </div>
-                </div>
-                <div class="gh-expandable-block">
-                    <div class="gh-expandable-header">
-                        <div>
-                            <h4 class="gh-expandable-title">Webmentions</h4>
-                            <p class="gh-expandable-description">
-                                Allows viewing received mentions on the dashboard.
-                            </p>
-                        </div>
-                        <div class="for-switch">
-                            <GhFeatureFlag @flag="webmentions" />
-                        </div>
-                    </div>
-                </div>
-                <div class="gh-expandable-block">
-                    <div class="gh-expandable-header">
-                        <div>
-                            <h4 class="gh-expandable-title">Websockets</h4>
-                            <p class="gh-expandable-description">
-                                Test out Websockets functionality at <code>/ghost/#/websockets</code>.
-                            </p>
-                        </div>
-                        <div class="for-switch">
-                            <GhFeatureFlag @flag="websockets" />
-                        </div>
-                    </div>
-                </div>
-                <div class="gh-expandable-block">
-                    <div class="gh-expandable-header">
-                        <div>
-                            <h4 class="gh-expandable-title">Stripe Automatic Tax</h4>
-                            <p class="gh-expandable-description">
-                               Use Stripe Automatic Tax at Stripe Checkout. Needs to be enabled in Stripe
-                            </p>
-                        </div>
-                        <div class="for-switch">
-                            <GhFeatureFlag @flag="stripeAutomaticTax" />
-                        </div>
-                    </div>
-                </div>
-                <div class="gh-expandable-block">
-                    <div class="gh-expandable-header">
-                        <div>
-                            <h4 class="gh-expandable-title">Email customization</h4>
-                            <p class="gh-expandable-description">
-                                Adding more control over the newsletter template
-                            </p>
-                        </div>
-                        <div class="for-switch">
-                            <GhFeatureFlag @flag="emailCustomization" />
-                        </div>
-                    </div>
-                </div>
-
-                <div class="gh-expandable-block">
-                    <div class="gh-expandable-header">
-                        <div>
-                            <h4 class="gh-expandable-title">Collections</h4>
-                            <p class="gh-expandable-description">
-                                Enables Collections 2.0
-                            </p>
-                        </div>
-                        <div class="for-switch">
-                            <GhFeatureFlag @flag="collections" />
-                        </div>
-                    </div>
-                </div>
-
-                <div class="gh-expandable-block">
-                    <div class="gh-expandable-header">
-                        <div>
-                            <h4 class="gh-expandable-title">Collections Card</h4>
-                            <p class="gh-expandable-description">
-                                Enables the Collections Card for pages - requires Collections and the beta Editor to be enabled
-                            </p>
-                        </div>
-                        <div class="for-switch">
-                            <GhFeatureFlag @flag="collectionsCard" />
-                        </div>
-                    </div>
-                </div>
-
-                <div class="gh-expandable-block">
-                    <div class="gh-expandable-header">
-                        <div>
-                            <h4 class="gh-expandable-title">Mail Events</h4>
-                            <p class="gh-expandable-description">
-                                Enables processing of mail events
-                            </p>
-                        </div>
-                        <div class="for-switch">
-                            <GhFeatureFlag @flag="mailEvents" />
-                        </div>
-                    </div>
-                </div>
-
-                <div class="gh-expandable-block">
-                    <div class="gh-expandable-header">
-                        <div>
-                            <h4 class="gh-expandable-title">Lexical indicators</h4>
-                            <p class="gh-expandable-description">
-                                Show L/M indicator on posts list for easier debugging
-                            </p>
-                        </div>
-                        <div class="for-switch">
-                            <GhFeatureFlag @flag="lexicalIndicators" />
-                        </div>
-                    </div>
-                </div>
-
-                <div class="gh-expandable-block">
-                    <div class="gh-expandable-header">
-                        <div>
-                            <h4 class="gh-expandable-title">Import Member Tier</h4>
-                            <p class="gh-expandable-description">
-                                Enables tier to be specified when importing members
-                            </p>
-                        </div>
-                        <div class="for-switch">
-                            <GhFeatureFlag @flag="importMemberTier" />
-                        </div>
-                    </div>
-                </div>
-
-                <div class="gh-expandable-block">
-                    <div class="gh-expandable-header">
-                        <div>
-                            <h4 class="gh-expandable-title">Tips & donations</h4>
-                            <p class="gh-expandable-description">
-                                Enables publishers to collect one-time payments
-                            </p>
-                        </div>
-                        <div class="for-switch">
-                            <GhFeatureFlag @flag="tipsAndDonations" />
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-        {{/if}}
-    </section>
-</section>
diff --git a/ghost/admin/app/templates/settings/labs/import.hbs b/ghost/admin/app/templates/settings/labs/import.hbs
deleted file mode 100644
index 3a840859ebe..00000000000
--- a/ghost/admin/app/templates/settings/labs/import.hbs
+++ /dev/null
@@ -1,4 +0,0 @@
-<GhFullscreenModal @modal="import-content"
-    @confirm={{this.close}}
-    @close={{this.close}}
-    @modifier="action import-content" />
diff --git a/ghost/admin/app/templates/settings/membership.hbs b/ghost/admin/app/templates/settings/membership.hbs
deleted file mode 100644
index e46ff0cf799..00000000000
--- a/ghost/admin/app/templates/settings/membership.hbs
+++ /dev/null
@@ -1,246 +0,0 @@
-<section class="gh-canvas circle-bg" {{did-insert this.setup}}>
-    <GhCanvasHeader class="gh-canvas-header gh-setting-members-header">
-        <div class="flex flex-column">
-            <div class="gh-canvas-breadcrumb">
-                <LinkTo @route="settings">
-                    Settings
-                </LinkTo>
-                {{svg-jar "arrow-right-small"}} Membership
-            </div>
-            <h2 class="gh-canvas-title" data-test-screen-title>
-                Membership
-            </h2>
-        </div>
-        <section class="view-actions">
-            <GhTaskButton
-                @buttonText="Save"
-                @task={{this.saveSettingsTask}}
-                @successText="Saved"
-                @runningText="Saving"
-                @class="gh-btn gh-btn-primary gh-btn-icon"
-                {{on-key "cmd+s"}}
-                data-test-button="save-settings"
-            />
-        </section>
-    </GhCanvasHeader>
-
-    <section class="view-container settings-debug">
-
-        <div class="gh-main-layout gh-setting-membership content-preview">
-            <div class="gh-setting-members-basicsform">
-                <p class="intro">Fund your work with subscription revenue. Connect your Stripe account and offer premium content to your audience. Our creators are already making over $12 million per year, while <strong>Ghost takes 0% payment fees</strong>.</p>
-
-                <div class="flex flex-column justify-between mt3">
-                    <section class="gh-expandable gh-setting-members-portalcta">
-                        <div class="gh-expandable-block">
-                            <div class="gh-expandable-header">
-                                <div>
-                                    <h4 class="gh-expandable-title">Portal Settings</h4>
-                                    <p class="gh-expandable-description">
-                                        Customize members modal signup flow
-                                    </p>
-                                </div>
-                                <button type="button" class="gh-btn gh-btn-green" disabled={{eq this.settings.membersSignupAccess "none"}} {{on "click" this.openPortalSettings}} data-test-toggle="portal-settings">
-                                    <span>Customize Portal &rarr;</span>
-                                </button>
-                            </div>
-                        </div>
-                    </section>
-
-                    <div class="gh-setting-rich-dropdown">
-                        <Settings::MembersSubscriptionAccess @onChange={{this.membersSubscriptionAccessChanged}} />
-                        <Settings::MembersDefaultPostAccess />
-                        <Settings::MembersCommentAccess />
-                    </div>
-                </div>
-            </div>
-            <div class="gh-setting-members-portalpreview">
-                <div class="gh-setting-members-portal-mock mock-enabled">
-                    {{#if (or (eq this.settings.membersSignupAccess 'none') this.switchFromNoneTask.isRunning)}}
-                        <div class="gh-setting-members-portal-disabled" data-test-portal-preview-disabled>
-                            <span class="lightgrey">{{svg-jar "portal-logo-stroke"}}</span>
-                            <h4>Portal disabled</h4>
-                            <p>Change your Subscription Access setting to re-enable Portal</p>
-                        </div>
-                    {{else}}
-                        <GhSiteIframe
-                            scrolling="no"
-                            @src={{this.portalPreviewUrl}}
-                            @invisibleUntilLoaded="portal-ready"
-                            @onInserted={{this.portalPreviewInserted}}
-                            @onDestroyed={{this.portalPreviewDestroyed}}
-                            data-test-iframe="portal-preview"/>
-                    {{/if}}
-                </div>
-            </div>
-        </div>
-
-        <div class="gh-setting-members-tierscontainer">
-            <div class="gh-settings-members-tiersheader">
-                <h4 class="gh-main-section-header small bn">Membership tiers</h4>
-                {{#if this.session.user.isAdmin}}
-                    {{#if (feature "tipsAndDonations")}}
-                        {{#if this.membersUtils.isStripeEnabled}}
-                            <button
-                                type="button"
-                                class="gh-btn gh-btn-outline gh-btn-stripe-status {{if this.isConnectDisallowed "disabled"}} {{if this.membersUtils.isStripeEnabled "connected" ""}}"
-                                {{on "click" this.openStripeConnect}}
-                                disabled={{and (eq this.settings.membersSignupAccess "none") (not this.membersUtils.isStripeEnabled)}}
-                            >
-                                <span>
-                                    Connected to Stripe
-                                </span>
-                            </button>
-                        {{else}}
-                            <button type="button" class="stripe-connect mb2 {{if (or (not this.session.user.isAdmin) this.isConnectDisallowed) "disabled"}}" {{on "click" this.openStripeConnect}}>
-                                <span></span>
-                            </button>
-                        {{/if}}
-                    {{else}}
-                        <button
-                            type="button"
-                            class="gh-btn gh-btn-outline gh-btn-stripe-status {{if this.isConnectDisallowed "disabled"}} {{if this.membersUtils.isStripeEnabled "connected" ""}}"
-                            {{on "click" this.openStripeConnect}}
-                            disabled={{and (eq this.settings.membersSignupAccess "none") (not this.membersUtils.isStripeEnabled)}}
-                        >
-                            <span>
-                                {{if this.membersUtils.isStripeEnabled "Connected to Stripe" "Stripe not connected"}}
-                            </span>
-                        </button>
-                    {{/if}}
-                {{/if}}
-            </div>
-            <section class="gh-expandable gh-expendable-free-membership">
-                <div class="gh-expandable-block">
-                    <div class="gh-expandable-header">
-                        <div>
-                            <h4 class="gh-expandable-title">Free</h4>
-                            <p class="gh-expandable-description">Free member sign up settings</p>
-                        </div>
-                        <button type="button" class="gh-btn" {{on "click" (toggle "freeOpen" this)}} data-test-button="toggle-free-settings" disabled={{eq this.settings.membersSignupAccess "none"}}><span>{{if this.freeOpen "Close" "Expand"}}</span></button>
-                    </div>
-                    <div class="gh-expandable-content">
-                        {{#liquid-if this.freeOpen}}
-                        <div class="gh-setting-content-extended" data-test-free-settings-expanded>
-                            <GhTierCard
-                                @tier={{this.freeTier}}
-                                @tiers={{this.tiers}}
-                                @openEditTier={{this.openEditTier}}
-                            />
-                            <GhFormGroup>
-                                <label for="welcomePage" class="fw6">Welcome page</label>
-                                <GhUrlInput
-                                    @id="welcomePage"
-                                    @value={{readonly this.freeTier.welcomePageURL}}
-                                    @baseUrl={{readonly this.siteUrl}}
-                                    @setResult={{this.setWelcomePageURL}}
-                                    @validateUrl={{this.validateWelcomePageURL}}
-                                    @placeholder={{readonly this.siteUrl}}
-                                    data-test-input="free-welcome-page"
-                                />
-                                <p>Redirect to this URL after signup for a free membership</p>
-                            </GhFormGroup>
-                        </div>
-                        {{/liquid-if}}
-                    </div>
-                </div>
-                <div class="gh-expandable-block">
-                    <div class="gh-expandable-header">
-                        <div>
-                            <h4 class="gh-expandable-title">Premium</h4>
-                            {{#if (feature "tipsAndDonations")}}
-                                <p class="gh-expandable-description">Set prices and paid member sign up settings.
-                                    {{#if this.membersUtils.isStripeEnabled}}
-                                    {{else}}
-                                         <button type="button" {{on "click" this.openStripeConnect}} class="gh-stripe-connect-link">Connect with Stripe</button>
-                                    {{/if}}</p>
-                            {{else}}
-                                <p class="gh-expandable-description">Set prices and paid member sign up settings</p>
-                            {{/if}}
-                        </div>
-
-                        {{#if (feature "tipsAndDonations")}}
-                            {{#if this.membersUtils.isStripeEnabled}}
-                                <button type="button" class="gh-btn" {{on "click" (toggle "paidOpen" this)}} disabled={{eq this.settings.membersSignupAccess "none"}} data-test-toggle-pub-info><span>{{if this.paidOpen "Close" "Expand"}}</span></button>
-                            {{else}}
-                                <button type="button" class="gh-btn" {{on "click" (toggle "paidOpen" this)}} disabled={{true}} data-test-toggle-pub-info><span>{{if this.paidOpen "Close" "Expand"}}</span></button>
-                            {{/if}}
-                        {{else}}
-                            {{#if this.membersUtils.isStripeEnabled}}
-                                <button type="button" class="gh-btn" {{on "click" (toggle "paidOpen" this)}} disabled={{eq this.settings.membersSignupAccess "none"}} data-test-toggle-pub-info><span>{{if this.paidOpen "Close" "Expand"}}</span></button>
-                            {{else}}
-                                <button type="button" class="stripe-connect {{if (or (not this.session.user.isAdmin) this.isConnectDisallowed) "disabled"}}" {{on "click" this.openStripeConnect}}>
-                                    <span></span>
-                                </button>
-                            {{/if}}
-                        {{/if}}
-                    </div>
-                    {{#if this.isConnectDisallowed}}
-                    <div class="gh-setting-nossl">
-                        <div class="gh-setting-nossl-container">
-                            <span class="red">{{svg-jar "shield-lock"}}</span>
-                            <h4>Your site is not secured</h4>
-                            <p>Paid memberships through Ghost can only be run on sites secured by SSL (HTTPS vs. HTTP). More information on adding a free SSL Certificate to your Ghost site can be <a href="https://ghost.org/integrations/lets-encrypt/" target="_blank" rel="noopener noreferrer">found here</a>.</p>
-                        </div>
-                    </div>
-                    {{/if}}
-                    <div class="gh-expandable-content">
-                        {{#liquid-if this.paidOpen}}
-                        <div class="gh-setting-content-extended">
-                            {{#if this.fetchDefaultTier.isRunning}}
-                                Loading...
-                            {{else}}
-                                <GhMembershipTiersAlpha
-                                    @updatePortalPreview={{this.updatePortalPreview}}
-                                    @tiers={{this.paidTiers}}
-                                    @confirmTierSave={{this.confirmTierSave}}
-                                />
-                            {{/if}}
-                        </div>
-                        {{/liquid-if}}
-                    </div>
-                </div>
-            </section>    
-        </div>
-    </section>
-
-    <section class="gh-main-section">
-        <h4 class="gh-main-section-header small bn">Growth</h4>
-        <div class="gh-expandable">
-            <Settings::SignupFormEmbed />
-            {{#if (feature "tipsAndDonations")}}
-                <Settings::TipsAndDonations @openStripeConnect={{this.openStripeConnect}}/>
-            {{/if}}
-        </div>
-    </section>
-
-    {{#if this.showPortalSettings}}
-        <GhFullscreenModal
-            @modal="portal-settings"
-            @model={{hash
-                preloadTask=this.saveSettingsTask
-                openStripeConnect=this.openStripeConnect
-                tiers=this.tiers
-            }}
-            @close={{this.closePortalSettings}}
-            @modifier="full-overlay portal-settings" />
-    {{/if}}
-
-    {{#if this.showStripeConnect}}
-        <GhFullscreenModal
-            @modal="stripe-connect"
-            @close={{this.closeStripeConnect}}
-            @modifier="action wide stripe-connect" />
-    {{/if}}
-    {{#if this.showTierModal}}
-        <GhFullscreenModal
-            @modal="tier"
-            @model={{hash
-                tier=this.tierModel
-                tiers=this.tiers
-            }}
-            @confirm={{this.confirmTierSave}}
-            @close={{this.closeTierModal}}
-            @modifier="edit-tier action wide" />
-    {{/if}}
-</section>
diff --git a/ghost/admin/app/templates/settings/navigation.hbs b/ghost/admin/app/templates/settings/navigation.hbs
deleted file mode 100644
index c3d0341565c..00000000000
--- a/ghost/admin/app/templates/settings/navigation.hbs
+++ /dev/null
@@ -1,81 +0,0 @@
-<section class="gh-canvas">
-    <GhCanvasHeader class="gh-canvas-header">
-        <div class="flex flex-column">
-            <div class="gh-canvas-breadcrumb">
-                <LinkTo @route="settings">
-                    Settings
-                </LinkTo>
-                {{svg-jar "arrow-right-small"}} Navigation
-            </div>
-            <h2 class="gh-canvas-title" data-test-screen-title>
-                Navigation
-            </h2>
-        </div>
-        <section class="view-actions">
-            <GhTaskButton @task={{this.saveTask}} @class="gh-btn gh-btn-primary gh-btn-icon" data-test-save-button={{true}} />
-        </section>
-    </GhCanvasHeader>
-
-    <section class="gh-main-section">
-        <h4 class="gh-main-section-header small bn">Primary Navigation</h4>
-        <div class="gh-main-section-block">
-            <div class="gh-main-section-content padding-top-s grey">
-                <form id="settings-navigation" class="gh-blognav" novalidate="novalidate">
-                    <SortableObjects @sortableObjectList={{this.settings.navigation}} @useSwap={{false}}>
-                        {{#each this.settings.navigation as |navItem index|}}
-                            <DraggableObject @content={{navItem}} @dragHandle=".gh-blognav-grab" @isSortable={{true}}>
-                                <Settings::Navigation::NavItem
-                                    @navItem={{navItem}}
-                                    @baseUrl={{this.blogUrl}}
-                                    @addItem={{this.addNavItem}}
-                                    @deleteItem={{this.deleteNavItem}}
-                                    @updateUrl={{this.updateUrl}}
-                                    @updateLabel={{this.updateLabel}}
-                                    data-test-navitem={{index}} />
-                            </DraggableObject>
-                        {{/each}}
-                    </SortableObjects>
-                    <Settings::Navigation::NavItem
-                        @navItem={{this.newNavItem}}
-                        @baseUrl={{this.blogUrl}}
-                        @addItem={{this.addNavItem}}
-                        @updateUrl={{this.updateUrl}}
-                        @updateLabel={{this.updateLabel}}
-                        data-test-navitem="new" />
-                </form>
-            </div>
-        </div>
-
-        <h4 class="gh-main-section-header small bn">Secondary Navigation</h4>
-        <div class="gh-main-section-block">
-            <div class="gh-main-section-content padding-top-s grey">
-                <form id="secondary-navigation" class="gh-blognav" novalidate="novalidate">
-                    <SortableObjects @sortableObjectList={{this.settings.secondaryNavigation}} @useSwap={{false}}>
-                        {{#each this.settings.secondaryNavigation as |navItem index|}}
-                            <DraggableObject @content={{navItem}} @dragHandle=".gh-blognav-grab" @isSortable={{true}}>
-                                <Settings::Navigation::NavItem
-                                    @navItem={{navItem}}
-                                    @baseUrl={{this.blogUrl}}
-                                    @addItem={{this.addNavItem}}
-                                    @deleteItem={{this.deleteNavItem}}
-                                    @updateUrl={{this.updateUrl}}
-                                    @updateLabel={{this.updateLabel}}
-                                    data-test-navitem={{index}} />
-                            </DraggableObject>
-                        {{/each}}
-                    </SortableObjects>
-                    <Settings::Navigation::NavItem
-                        @navItem={{this.newSecondaryNavItem}}
-                        @baseUrl={{this.blogUrl}}
-                        @addItem={{this.addNavItem}}
-                        @updateUrl={{this.updateUrl}}
-                        @updateLabel={{this.updateLabel}}
-                        data-test-navitem="new" />
-                </form>
-            </div>
-        </div>
-    </section>
-</section>
-
-{{outlet}}
-
diff --git a/ghost/admin/app/templates/settings/newsletters.hbs b/ghost/admin/app/templates/settings/newsletters.hbs
deleted file mode 100644
index 43dcc6836ed..00000000000
--- a/ghost/admin/app/templates/settings/newsletters.hbs
+++ /dev/null
@@ -1,32 +0,0 @@
-<section class="gh-canvas gh-setting-email">
-    <GhCanvasHeader class="gh-canvas-header">
-        <div class="flex flex-column">
-            <div class="gh-canvas-breadcrumb">
-                <LinkTo @route="settings">
-                    Settings
-                </LinkTo>
-                {{svg-jar "arrow-right-small"}} Email newsletter
-            </div>
-            <h2 class="gh-canvas-title" data-test-screen-title>
-                Email newsletter
-            </h2>
-        </div>
-        <section class="view-actions">
-            <GhTaskButton
-                @buttonText="Save"
-                @task={{this.saveSettings}}
-                @successText="Saved"
-                @runningText="Saving"
-                @class="gh-btn gh-btn-primary gh-btn-icon"
-                {{on-key "cmd+s"}}
-                data-test-button="save-members-settings"
-            />
-        </section>
-    </GhCanvasHeader>
-
-    <section class="view-container settings-debug">
-        <div class="gh-setting-liquid-section">
-            <Settings::Newsletters />
-        </div>
-    </section>
-</section>
diff --git a/ghost/admin/app/templates/settings/staff/index.hbs b/ghost/admin/app/templates/settings/staff/index.hbs
deleted file mode 100644
index fd080ed5814..00000000000
--- a/ghost/admin/app/templates/settings/staff/index.hbs
+++ /dev/null
@@ -1,156 +0,0 @@
-<section class="gh-canvas">
-    <GhCanvasHeader class="gh-canvas-header">
-        <div class="flex flex-column">
-            {{#unless this.session.user.isEditor}}
-                <div class="gh-canvas-breadcrumb">
-                    <LinkTo @route="settings" data-test-breadcrumb>
-                        Settings
-                    </LinkTo>
-                    {{svg-jar "arrow-right-small"}} Staff
-                </div>
-            {{/unless}}
-            <h2 class="gh-canvas-title" data-test-screen-title>
-                Staff
-            </h2>
-        </div>
-
-        {{!-- Do not show Invite user button to authors --}}
-        {{#unless this.currentUser.isAuthorOrContributor}}
-            <section class="view-actions">
-                {{#if (gh-user-can-admin this.session.user)}}
-                    <span class="dropdown">
-                        <GhDropdownButton
-                            @dropdownName="staff-actions-menu"
-                            @classNames="gh-btn gh-btn-icon icon-only gh-btn-action-icon"
-                            @title="Staff Actions"
-                            data-test-button="staff-actions"
-                        >
-                            <span>
-                                {{svg-jar "settings"}}
-                                <span class="hidden">Actions</span>
-                            </span>
-                        </GhDropdownButton>
-                        <GhDropdown
-                            @name="staff-actions-menu"
-                            @tagName="ul"
-                            @classNames="gh-member-actions-menu dropdown-menu dropdown-triangle-top-right"
-                        >
-                            <li>
-                                <button type="button" {{on "click" this.toggleResetAllPasswordsModal}}>
-                                    <span>Reset all passwords</span>
-                                </button>
-                            </li>
-                        </GhDropdown>
-                    </span>
-                {{/if}}
-                <button class="gh-btn gh-btn-primary" data-test-button="invite-staff-user" type="button" {{on "click" this.toggleInviteUserModal}}><span>Invite people</span></button>
-            </section>
-        {{/unless}}
-    </GhCanvasHeader>
-
-    {{#if this.showInviteUserModal}}
-        <GhFullscreenModal @modal="invite-new-user"
-            @close={{this.toggleInviteUserModal}}
-            @modifier="action wide invite-user" />
-    {{/if}}
-
-    {{#if this.showResetAllPasswordsModal}}
-        <GhFullscreenModal @modal="reset-all-passwords"
-            @close={{this.toggleResetAllPasswordsModal}}
-            @modifier="action wide" />
-    {{/if}}
-
-    <section class="view-container gh-team">
-    {{!-- Show invited users to everyone except authors --}}
-    {{#unless this.currentUser.isAuthorOrContributor}}
-        {{#if this.invites}}
-        <section class="gh-main-section gh-invited-users apps-first-header" data-test-invited-users>
-            <h4 class="gh-main-section-header small">Invited users</h4>
-            <div class="apps-grid">
-
-                {{#each this.invites as |invite|}}
-                    <GhUserInvited @invite={{invite}} @reload={{perform this.backgroundUpdateTask}} as |component|>
-                        <div class="apps-grid-cell" data-test-invite-id="{{invite.id}}">
-                            <article class="apps-card-app">
-                                <div class="apps-card-left">
-                                    <span class="user-list-item-icon">{{svg-jar "email"}}ic</span>
-                                    <div class="apps-card-meta">
-                                        <h3 class="apps-card-app-title" data-test-email>{{invite.email}}</h3>
-                                        <p class="apps-card-app-desc">
-                                            {{#if invite.pending}}
-                                                <span class="description-error">
-                                                    Invitation not sent - please try again
-                                                </span>
-                                            {{else}}
-                                                <span class="description" data-test-invite-description>
-                                                    Invitation sent: {{component.createdAt}},
-                                                    {{if component.isExpired "expired" "expires"}} {{component.expiresAt}}
-                                                </span>
-                                            {{/if}}
-                                        </p>
-                                    </div>
-                                </div>
-                                <div class="apps-card-right">
-                                    <div class="apps-configured">
-                                        {{#if component.isSending}}
-                                            <span>Sending Invite...</span>
-                                        {{else}}
-                                            <a class="apps-configured-action red-hover" href="#revoke" {{on "click" component.revoke}} data-test-revoke-button>
-                                                Revoke
-                                            </a>
-                                            <a class="apps-configured-action green-hover" href="#resend" {{on "click" component.resend}} data-test-resend-button>
-                                                Resend
-                                            </a>
-
-                                            <span class="apps-configured-action gh-badge {{invite.role.lowerCaseName}}" data-test-role-name>{{invite.role.name}}</span>
-                                        {{/if}}
-                                    </div>
-                                </div>
-                            </article>
-                        </div>
-                    </GhUserInvited>
-                {{/each}}
-
-            </div>
-        </section>
-        {{/if}}
-    {{/unless}}
-
-    <section class="gh-main-section gh-active-users {{unless this.invites "apps-first-header"}}" data-test-active-users>
-        <h4 class="gh-main-section-header small">Active users</h4>
-        <div class="apps-grid">
-            {{!-- For authors/contributors, only show their own user --}}
-            {{#if this.currentUser.isAuthorOrContributor}}
-                <GhUserActive @user={{this.currentUser}} as |component|>
-                    <GhUserListItem @user={{this.currentUser}} @component={{component}} />
-                </GhUserActive>
-            {{else}}
-                {{#vertical-collection this.activeUsers
-                    key="id"
-                    containerSelector=".gh-main"
-                    estimateHeight=75
-                    as |user|
-                }}
-                    <GhUserActive @user={{user}} as |component|>
-                        <GhUserListItem @user={{user}} @component={{component}} />
-                    </GhUserActive>
-                {{/vertical-collection}}
-            {{/if}}
-        </div>
-    </section>
-    </section>
-
-    {{!-- Don't show if we have no suspended users or logged in as an author --}}
-    {{#if (and this.suspendedUsers (not this.currentUser.isAuthorOrContributor))}}
-    <section class="apps-grid-container gh-active-users" data-test-suspended-users>
-        <span class="apps-grid-title">Suspended users</span>
-        <div class="apps-grid">
-            {{#each this.suspendedUsers key="id" as |user|}}
-                <GhUserActive @user={{user}} as |component|>
-                    <GhUserListItem @user={{user}} @component={{component}} />
-                </GhUserActive>
-            {{/each}}
-        </div>
-    </section>
-    {{/if}}
-</section>
diff --git a/ghost/admin/app/templates/settings/staff/user-loading.hbs b/ghost/admin/app/templates/settings/staff/user-loading.hbs
deleted file mode 100644
index 844fdb8c663..00000000000
--- a/ghost/admin/app/templates/settings/staff/user-loading.hbs
+++ /dev/null
@@ -1,37 +0,0 @@
-<section class="gh-canvas">
-    <GhCanvasHeader class="gh-canvas-header sticky">
-        {{!-- Remove breadcrumbs for Authors and Contributors --}}
-        {{#if this.currentUser.isAuthorOrContributor}}
-            <h2 class="gh-canvas-title" data-test-screen-title>Your profile</h2>
-        {{else}}
-            <div class="flex flex-column">
-                <div class="gh-canvas-breadcrumb">
-                    {{#unless this.session.user.isEditor}}
-                        <LinkTo @route="settings">
-                            Settings
-                        </LinkTo>
-                        {{svg-jar "arrow-right-small"}}
-                    {{/unless}}
-                    <LinkTo @route="settings.staff" data-test-staff-link={{true}}>
-                        Staff
-                    </LinkTo>
-                    {{svg-jar "arrow-right-small"}} Profile
-                </div>
-                <h2 class="gh-canvas-title" data-test-screen-title>
-                    {{this.user.name}}
-                    {{#if this.user.isSuspended}}
-                        <span class="gh-badge suspended" data-test-suspended-badge>Suspended</span>
-                    {{/if}}
-                </h2>
-            </div>
-        {{/if}}
-
-        <section class="view-actions">
-            <div class="gh-btn gh-btn-primary"><span>Save</span></div>
-        </section>
-    </GhCanvasHeader>
-
-    <div class="gh-content">
-        <GhLoadingSpinner />
-    </div>
-</section>
diff --git a/ghost/admin/app/templates/settings/staff/user.hbs b/ghost/admin/app/templates/settings/staff/user.hbs
deleted file mode 100644
index c5953a19c90..00000000000
--- a/ghost/admin/app/templates/settings/staff/user.hbs
+++ /dev/null
@@ -1,501 +0,0 @@
-<section class="gh-canvas" {{on-key "cmd+s" this.saveViaKeyboard}}>
-    <GhCanvasHeader class="gh-canvas-header">
-        {{!-- Remove breadcrumbs for Authors and Contributors --}}
-        {{#if this.currentUser.isAuthorOrContributor}}
-            <h2 class="gh-canvas-title" data-test-screen-title>Your profile</h2>
-        {{else}}
-            <div class="flex flex-column">
-                <div class="gh-canvas-breadcrumb" data-test-breadcrumb>
-                    {{#unless this.session.user.isEditor}}
-                        <LinkTo @route="settings">
-                            Settings
-                        </LinkTo>
-                        {{svg-jar "arrow-right-small"}}
-                    {{/unless}}
-                    <LinkTo @route="settings.staff" data-test-staff-link={{true}}>
-                        Staff
-                    </LinkTo>
-                    {{svg-jar "arrow-right-small"}} Profile
-                </div>
-                <h2 class="gh-canvas-title" data-test-screen-title>
-                    {{this.user.name}}
-                    {{#if this.user.isSuspended}}
-                        <span class="gh-badge suspended" data-test-suspended-badge>Suspended</span>
-                    {{/if}}
-                </h2>
-            </div>
-        {{/if}}
-
-        <section class="view-actions">
-            {{#if (or this.userActionsAreVisible this.session.user.isAdmin)}}
-                <span class="dropdown">
-                    <GhDropdownButton @dropdownName="user-actions-menu" @classNames="gh-btn gh-btn-white gh-btn-icon icon-only user-actions-cog" @title="User Actions" data-test-user-actions>
-                        <span>
-                            {{svg-jar "settings"}}
-                            <span class="hidden">User Settings</span>
-                        </span>
-                    </GhDropdownButton>
-                    <GhDropdown @name="user-actions-menu" @tagName="ul" @classNames="user-actions-menu dropdown-menu dropdown-align-right">
-                        {{#if this.canMakeOwner}}
-                            <li>
-                                <button type="button" {{on "click" this.transferOwnership}}>
-                                    Make owner
-                                </button>
-                            </li>
-                        {{/if}}
-                        {{#if this.deleteUserActionIsVisible}}
-                            <li>
-                                <button class="delete" data-test-delete-button type="button" {{on "click" this.deleteUser}}>
-                                    Delete user
-                                </button>
-                            </li>
-                            {{#if this.user.isActive}}
-                                <li>
-                                    <button class="suspend" data-test-suspend-button type="button" {{on "click" this.suspendUser}}>
-                                        Suspend user
-                                    </button>
-                                </li>
-                            {{/if}}
-                            {{#if this.user.isSuspended}}
-                                <li>
-                                    <button class="unsuspend" data-test-unsuspend-button type="button" {{on "click" this.unsuspendUser}}>
-                                        Un-suspend user
-                                    </button>
-                                </li>
-                            {{/if}}
-                        {{/if}}
-
-                        <li>
-                            <LinkTo @route="settings.history" @query={{hash user=this.user.id}}>
-                                <span>View user activity</span>
-                            </LinkTo>
-                        </li>
-                    </GhDropdown>
-                </span>
-            {{/if}}
-
-            <GhTaskButton @class="gh-btn gh-btn-primary gh-btn-icon" @task={{this.saveTask}} data-test-save-button />
-        </section>
-    </GhCanvasHeader>
-
-    {{#if this.user.isLocked}}
-        <p class="gh-box gh-box-alert">{{svg-jar "info"}}This user account is locked. To sign in, ask this user to perform a password reset on their account.</p>
-    {{/if}}
-
-    {{!-- <div class="bg-"> --}}
-    <section>
-        <div class="gm-main view-container settings-user">
-            <form id="user-settings-form" class="user-profile" novalidate="novalidate" autocomplete="off" {{on "submit" (perform this.saveTask)}}>
-
-                <figure class="user-cover" style={{background-image-style this.user.coverImageUrl}}>
-                    <button type="button" class="gh-btn gh-btn-default user-cover-edit" {{on "click" this.changeCoverImage}}><span>Change cover</span></button>
-                </figure>
-
-                <figure class="user-image bg-whitegrey">
-                    <div id="user-image" class="img" style={{background-image-style this.user.profileImageUrl}}><span class="hidden">{{this.user.name}}"s picture</span></div>
-                    <button type="button" class="edit-user-image" {{on "click" this.changeProfileImage}}>Edit picture</button>
-                </figure>
-
-                <div class="pa5">
-                    <fieldset class="user-details-bottom">
-
-                        <GhFormGroup @errors={{this.user.errors}} @hasValidated={{this.user.hasValidated}} @property="name" class="first-form-group">
-                            <label for="user-name">Full name</label>
-                            <input
-                                type="text"
-                                id="user-name"
-                                class="gh-input user-name"
-                                autocorrect="off"
-                                value={{this.user.name}}
-                                {{on "input" (fn this.setModelProperty "name")}}
-                                {{on "blur" (fn this.validateModelProperty "name")}}
-                                data-test-name-input
-                            />
-                            {{#if this.user.errors.name}}
-                                <GhErrorMessage @errors={{this.user.errors}} @property="name" data-test-error="user-name" />
-                            {{else}}
-                                <p>Use your real name so people can recognize you</p>
-                            {{/if}}
-                        </GhFormGroup>
-
-                        <GhFormGroup @errors={{this.user.errors}} @hasValidated={{this.user.hasValidated}} @property="slug">
-                            <label for="user-slug">Slug</label>
-                            <input
-                                type="text"
-                                id="user-slug"
-                                class="gh-input user-slug"
-                                autocorrect="off"
-                                value={{this.slugValue}}
-                                {{on "input" this.setSlugValue}}
-                                {{on "blur" (perform this.updateSlugTask)}}
-                                {{select-on-click}}
-                                data-test-slug-input
-                            />
-                            <p><GhBlogUrl />/author/{{this.slugValue}}</p>
-                            <GhErrorMessage @errors={{this.user.errors}} @property="slug" data-test-error="user-slug" />
-                        </GhFormGroup>
-
-                        <GhFormGroup @errors={{this.user.errors}} @hasValidated={{this.user.hasValidated}} @property="email">
-                            <label for="user-email">Email</label>
-                            {{!-- Administrators only see text of Owner's email address but not input --}}
-                            {{#if this.canChangeEmail}}
-                                <input
-                                    type="email"
-                                    id="user-email"
-                                    class="gh-input"
-                                    placeholder="jamie@example.com"
-                                    autocapitalize="off"
-                                    autocorrect="off"
-                                    autocomplete="off"
-                                    value={{this.user.email}}
-                                    {{on "input" (fn this.setModelProperty "email")}}
-                                    {{on "blur" (fn this.validateModelProperty "email")}}
-                                    data-test-email-input
-                                />
-                                <GhErrorMessage @errors={{this.user.errors}} @property="email" data-test-error="user-email" />
-                            {{else}}
-                                <span>{{this.user.email}}</span>
-                            {{/if}}
-                            <p>Used for notifications</p>
-                        </GhFormGroup>
-
-                        {{#if this.rolesDropdownIsVisible}}
-                            <div class="form-group">
-                                <label for="user-role">Role</label>
-                                <button type="button" class="gh-input tl" {{on "click" this.selectRole}}>{{this.user.role.name}}{{svg-jar "arrow-down-small"}}</button>
-                                <p>What permissions should this user have?</p>
-                            </div>
-                        {{/if}}
-
-                        <GhFormGroup @errors={{this.user.errors}} @hasValidated={{this.user.hasValidated}} @property="location">
-                            <label for="user-location">Location</label>
-                            <input
-                                type="text"
-                                id="user-location"
-                                class="gh-input"
-                                value={{this.user.location}}
-                                {{on "input" (fn this.setModelProperty "location")}}
-                                {{on "blur" (fn this.validateModelProperty "location")}}
-                                data-test-location-input
-                            />
-                            <GhErrorMessage @errors={{this.user.errors}} @property="location" data-test-error="user-location" />
-                            <p>Where in the world do you live?</p>
-                        </GhFormGroup>
-
-                        <GhFormGroup @errors={{this.user.errors}} @hasValidated={{this.user.hasValidated}} @property="website">
-                            <label for="user-website">Website</label>
-                            <input
-                                type="url"
-                                id="user-website"
-                                class="gh-input"
-                                autocapitalize="off"
-                                autocorrect="off"
-                                autocomplete="off"
-                                value={{this.user.website}}
-                                {{on "input" (fn this.setModelProperty "website")}}
-                                {{on "blur" (fn this.validateModelProperty "website")}}
-                                data-test-website-input
-                            />
-                            <GhErrorMessage @errors={{this.user.errors}} @property="website" data-test-error="user-website" />
-                            <p>Have a website or blog other than this one? Link it!</p>
-                        </GhFormGroup>
-
-                        <GhFormGroup @errors={{this.user.errors}} @hasValidated={{this.user.hasValidated}} @property="facebook">
-                            <label for="user-facebook">Facebook profile</label>
-                            <GhFacebookUrlInput
-                                id="user-facebook"
-                                @scratchValue={{this.scratchValues.facebook}}
-                                @setScratchValue={{fn this.setScratchValue "facebook"}}
-                                @model={{this.user}}
-                                @modelProperty="facebook"
-                            />
-                            <GhErrorMessage @errors={{this.user.errors}} @property="facebook" data-test-error="user-facebook" />
-                            <p>URL of your personal Facebook Profile</p>
-                        </GhFormGroup>
-
-                        <GhFormGroup @errors={{this.user.errors}} @hasValidated={{this.user.hasValidated}} @property="twitter">
-                            <label for="user-twitter">Twitter profile</label>
-                            <GhTwitterUrlInput
-                                id="user-twitter"
-                                @scratchValue={{this.scratchValues.twitter}}
-                                @setScratchValue={{fn this.setScratchValue "twitter"}}
-                                @model={{this.user}}
-                                @modelProperty="twitter"
-                            />
-                            <GhErrorMessage @errors={{this.user.errors}} @property="twitter" data-test-error="user-twitter" />
-                            <p>URL of your personal Twitter profile</p>
-                        </GhFormGroup>
-
-                        <GhFormGroup @errors={{this.user.errors}} @hasValidated={{this.user.hasValidated}} @property="bio" class="bio-container">
-                            <label for="user-bio">Bio</label>
-                            <textarea
-                                id="user-bio"
-                                class="gh-input"
-                                {{on "input" (fn this.setModelProperty "bio")}}
-                                {{on "blur" (fn this.validateModelProperty "bio")}}
-                                data-test-bio-input
-                            >{{this.user.bio}}</textarea>
-                            <GhErrorMessage @errors={{this.user.errors}} @property="bio" data-test-error="user-bio" />
-                            <p>
-                                Recommended: <strong>200</strong> characters.
-                                You've used {{gh-count-down-characters this.user.bio 200}}
-                            </p>
-                        </GhFormGroup>
-                        {{#if this.membersUtils.isMembersEnabled}}
-                        <div class="user-settings-subgroup">
-                            <h4 class="user-settings-heading">Email notifications</h4>
-                            <GhFormGroup @errors={{this.user.errors}} @hasValidated={{this.user.hasValidated}} @property="email">
-                                <div class="user-setting-toggle">
-                                    <div>
-                                        <label for="user-email">Comments</label>
-                                        <p>Every time a member comments on one of your posts</p>
-                                    </div>
-                                    <div class="for-switch small">
-                                        <label class="switch" for="comment-notifications">
-                                            <input
-                                                id="comment-notifications"
-                                                type="checkbox"
-                                                checked={{this.user.commentNotifications}}
-                                                class="gh-input"
-                                                {{on "change" this.toggleCommentNotifications}}
-                                                data-test-checkbox="comment-notifications"
-                                            >
-                                            <span class="input-toggle-component"></span>
-                                        </label>
-                                    </div>
-                                </div>
-                                {{#if this.user.isAdmin}}
-                                    {{#if (feature 'webmentions')}}
-                                        <div class="user-setting-toggle">
-                                            <div>
-                                                <label for="user-email">Mentions</label>
-                                                <p>Every time another site links to your work.</p>
-                                            </div>
-                                            <div class="for-switch small">
-                                                <label class="switch" for="mention-notifications" data-test-label="mention-notifications">
-                                                    <input
-                                                        id="mention-notifications"
-                                                        type="checkbox"
-                                                        checked={{this.user.mentionNotifications}}
-                                                        class="gh-input"
-                                                        {{on "change" this.toggleMentionNotifications}}
-                                                        data-test-checkbox="mention-notifications"
-                                                    >
-                                                    <span class="input-toggle-component"></span>
-                                                </label>
-                                            </div>
-                                        </div>
-                                    {{/if}}
-                                    {{#if this.canToggleMemberAlerts}}
-                                        <div class="user-setting-toggle">
-                                            <div>
-                                                <label for="user-email">New signups</label>
-                                                <p>Every time a new free member signs up</p>
-                                            </div>
-                                            <div class="for-switch small">
-                                                <label class="switch" for="free-signup-notifications" data-test-label="free-signup-notifications">
-                                                    <input
-                                                        id="free-signup-notifications"
-                                                        type="checkbox"
-                                                        checked={{this.user.freeMemberSignupNotification}}
-                                                        class="gh-input"
-                                                        {{on "change" (fn this.toggleMemberEmailAlerts 'free-signup')}}
-                                                        data-test-checkbox="free-signup-notifications"
-                                                    >
-                                                    <span class="input-toggle-component"></span>
-                                                </label>
-                                            </div>
-                                        </div>
-                                        {{#if this.membersUtils.paidMembersEnabled}}
-                                            <div class="user-setting-toggle">
-                                                <div>
-                                                    <label for="user-email">New paid members</label>
-                                                    <p>Every time a member starts a new paid subscription</p>
-                                                </div>
-                                                <div class="for-switch small">
-                                                    <label class="switch" for="paid-started-notifications" data-test-label="paid-started-notifications">
-                                                        <input
-                                                            id="paid-started-notifications"
-                                                            type="checkbox"
-                                                            checked={{this.user.paidSubscriptionStartedNotification}}
-                                                            class="gh-input"
-                                                            {{on "change" (fn this.toggleMemberEmailAlerts 'paid-started')}}
-                                                            data-test-checkbox="paid-started-notifications"
-                                                        >
-                                                        <span class="input-toggle-component"></span>
-                                                    </label>
-                                                </div>
-                                            </div>
-                                            <div class="user-setting-toggle">
-                                                <div>
-                                                    <label for="user-email">Paid member cancellations</label>
-                                                    <p>Every time a member cancels their paid subscription</p>
-                                                </div>
-                                                <div class="for-switch small">
-                                                    <label class="switch" for="paid-canceled-notifications" data-test-label="paid-canceled-notifications">
-                                                        <input
-                                                            id="paid-canceled-notifications"
-                                                            type="checkbox"
-                                                            checked={{this.user.paidSubscriptionCanceledNotification}}
-                                                            class="gh-input"
-                                                            {{on "change" (fn this.toggleMemberEmailAlerts 'paid-canceled')}}
-                                                            data-test-checkbox="paid-canceled-notifications"
-                                                        >
-                                                        <span class="input-toggle-component"></span>
-                                                    </label>
-                                                </div>
-                                            </div>
-                                        {{/if}}
-                                        {{#if this.membersUtils.isStripeEnabled}}
-                                            {{#if (feature 'tipsAndDonations')}}
-                                                <div class="user-setting-toggle">
-                                                    <div>
-                                                        <label for="user-email">Tips &amp; donations</label>
-                                                        <p>Every time you receive a one-time payment from your audience</p>
-                                                    </div>
-                                                    <div class="for-switch small">
-                                                        <label class="switch" for="donation-notifications" data-test-label="donation-notifications">
-                                                            <input
-                                                                id="donation-notifications"
-                                                                type="checkbox"
-                                                                checked={{this.user.donationNotifications}}
-                                                                class="gh-input"
-                                                                {{on "change" this.toggleDonationNotifications}}
-                                                                data-test-checkbox="donation-notifications"
-                                                            >
-                                                            <span class="input-toggle-component"></span>
-                                                        </label>
-                                                    </div>
-                                                </div>
-                                            {{/if}}
-                                        {{/if}}
-                                        <div class="user-setting-toggle">
-                                            <div>
-                                                <label for="user-email">Milestones</label>
-                                                <p>Occasional summaries of your audience & revenue growth</p>
-                                            </div>
-                                            <div class="for-switch small">
-                                                <label class="switch" for="milestone-notifications" data-test-label="milestone-notifications">
-                                                    <input
-                                                        id="milestone-notifications"
-                                                        type="checkbox"
-                                                        checked={{this.user.milestoneNotifications}}
-                                                        class="gh-input"
-                                                        {{on "change" this.toggleMilestoneNotifications}}
-                                                        data-test-checkbox="milestone-notifications"
-                                                    >
-                                                    <span class="input-toggle-component"></span>
-                                                </label>
-                                            </div>
-                                        </div>
-                                    {{/if}}
-                                {{/if}}
-                            </GhFormGroup>
-                        </div>
-                        {{/if}}
-                    </fieldset>
-                </div>
-
-            </form> {{! user details form }}
-
-            {{!-- If an administrator is viewing Owner's profile then hide inputs for change password --}}
-            {{#if this.canChangePassword}}
-                <form id="password-reset" class="user-profile" novalidate="novalidate" autocomplete="off" {{on "submit" this.submitPasswordForm}}>
-                    <div class="pa5">
-                        <fieldset class="user-details-form">
-                            {{#if this.isOwnProfile}}
-                                <GhFormGroup @errors={{this.user.errors}} @hasValidated={{this.user.hasValidated}} @property="password">
-                                    <label for="user-password-old">Old password</label>
-                                    <input
-                                        type="password"
-                                        id="user-password-old"
-                                        class="gh-input"
-                                        autocomplete="current-password"
-                                        value={{this.user.password}}
-                                        {{on "input" (fn this.setModelProperty "password")}}
-                                        {{on "input" (fn this.clearModelErrors "password")}}
-                                        data-test-old-pass-input
-                                    />
-                                    <GhErrorMessage @errors={{this.user.errors}} @property="password" data-test-error="user-old-pass" />
-                                </GhFormGroup>
-                            {{/if}}
-
-                            <GhFormGroup @errors={{this.user.errors}} @hasValidated={{this.user.hasValidated}} @property="newPassword">
-                                <label for="user-password-new">New password</label>
-                                <input
-                                    type="password"
-                                    id="user-password-new"
-                                    class="gh-input"
-                                    autocomplete="new-password"
-                                    value={{this.user.newPassword}}
-                                    {{on "input" (fn this.setModelProperty "newPassword")}}
-                                    {{on "input" (fn this.clearModelErrors "newPassword")}}
-                                    data-test-new-pass-input
-                                />
-                                <GhErrorMessage @errors={{this.user.errors}} @property="newPassword" data-test-error="user-new-pass" />
-                            </GhFormGroup>
-
-                            <GhFormGroup @errors={{this.user.errors}} @hasValidated={{this.user.hasValidated}} @property="ne2Password">
-                                <label for="user-new-password-verification">Verify password</label>
-                                <input
-                                    type="password"
-                                    id="user-new-password-verification"
-                                    class="gh-input"
-                                    value={{this.user.ne2Password}}
-                                    {{on "input" (fn this.setModelProperty "ne2Password")}}
-                                    {{on "input" (fn this.clearModelErrors "ne2Password")}}
-                                    data-test-ne2-pass-input
-                                />
-                                <GhErrorMessage @errors={{this.user.errors}} @property="ne2Password" data-test-error="user-ne2-pass" />
-                            </GhFormGroup>
-
-                            <div class="form-group">
-                                <GhTaskButton @buttonText="Change Password" @idleClass="gh-btn-red" @class="gh-btn gh-btn-icon button-change-password" @task={{this.saveNewPasswordTask}} data-test-save-pw-button="true" />
-                            </div>
-                        </fieldset>
-                    </div>
-                </form> {{! change password form }}
-            {{/if}}
-
-            {{#if this.isOwnProfile}}
-                <form class="user-profile">
-                    <div class="pa5">
-                        <fieldset class="user-details-form">
-                            <GhFormGroup>
-                                <label for="personal-token">Staff access token</label>
-                                <div class="relative flex items-center {{unless this.copyContentKeyTask.isRunning "hide-child-instant"}}">
-                                    <input
-                                        type="text"
-                                        id="personal-token"
-                                        class="gh-input"
-                                        value={{this.personalToken}}
-                                        readonly
-                                        {{select-on-click}}
-                                    />
-                                    <div class="app-api-personal-token-buttons child">
-                                        <button type="button" class="app-button-regenerate" {{on "click" this.regenerateStaffToken}} data-tooltip="Regenerate">
-                                            {{svg-jar "reload" class="w4 h4 stroke-midgrey"}}
-                                        </button>
-                                        <button type="button" class="app-button-copy" {{on "click" (perform this.copyContentKeyTask)}}>
-                                            {{#if this.copyContentKeyTask.isRunning}}
-                                                {{svg-jar "check-circle" class="w3 v-mid mr2 stroke-white"}} Copied
-                                            {{else}}
-                                                Copy
-                                            {{/if}}
-                                        </button>
-                                    </div>
-                                </div>
-                                <p>
-                                    Give apps personal access without sharing your email/password.
-                                </p>
-                                {{#if this.personalTokenRegenerated}}
-                                    <p class="green">Staff access token was successfully regenerated </p>
-                                {{/if}}
-                            </GhFormGroup>
-                        </fieldset>
-                    </div>
-                </form>
-            {{/if}}
-        </div>
-    </section>
-</section>
diff --git a/ghost/admin/app/utils/currency.js b/ghost/admin/app/utils/currency.js
index dec3badfb0a..225476d4285 100644
--- a/ghost/admin/app/utils/currency.js
+++ b/ghost/admin/app/utils/currency.js
@@ -168,7 +168,7 @@ export function getCurrencyOptions() {
 * based on Stripe's requirements. Values here are double the Stripe limits, to take conversions to the settlement currency into account.
 * @see https://stripe.com/docs/currencies#minimum-and-maximum-charge-amounts
 * @param {String} currency — Currency in the 3-letter ISO format (e.g. "USD", "EUR")
-* @retuns {Number} — Minimum amount
+* @returns {Number} — Minimum amount
 */
 export function minimumAmountForCurrency(currency) {
     const isoCurrency = currency?.toUpperCase();
diff --git a/ghost/admin/app/validators/post.js b/ghost/admin/app/validators/post.js
index 73aa67505b9..f6ab868a998 100644
--- a/ghost/admin/app/validators/post.js
+++ b/ghost/admin/app/validators/post.js
@@ -183,7 +183,7 @@ export default BaseValidator.create({
 
         // don't validate the date if the time format is incorrect
         if (isEmpty(model.errors.errorsFor('publishedAtBlogTime'))) {
-            let status = model.statusScratch || model.status;
+            let status = model.status;
             let now = moment();
             let publishedAtBlogTZ = model.publishedAtBlogTZ;
             let isInFuture = publishedAtBlogTZ.isSameOrAfter(now);
diff --git a/ghost/admin/ember-cli-build.js b/ghost/admin/ember-cli-build.js
index dcbab764464..4455adba64d 100644
--- a/ghost/admin/ember-cli-build.js
+++ b/ghost/admin/ember-cli-build.js
@@ -121,7 +121,8 @@ module.exports = function (defaults) {
                 'woff2',
                 'mp4',
                 'ico'
-            ]
+            ],
+            exclude: ['**/chunk*.map']
         },
         minifyJS: {
             options: {
@@ -205,6 +206,7 @@ module.exports = function (defaults) {
         autoImport: {
             publicAssetURL,
             webpack: {
+                devtool: 'source-map',
                 resolve: {
                     fallback: {
                         util: require.resolve('util'),
diff --git a/ghost/admin/lib/asset-delivery/index.js b/ghost/admin/lib/asset-delivery/index.js
index 09f34229253..aca83ba7e43 100644
--- a/ghost/admin/lib/asset-delivery/index.js
+++ b/ghost/admin/lib/asset-delivery/index.js
@@ -63,11 +63,21 @@ module.exports = {
         // copy the index.html file
         fs.copySync(`${results.directory}/index.html`, `${assetsOut}/index.html`, {overwrite: true, dereference: true});
 
-        // copy all the `/assets` files, except the `icons` folder
+        // get all the `/assets` files, except the `icons` folder
         const assets = walkSync(results.directory + '/assets', {
             ignore: ['icons']
         });
 
+        // loop over any sourcemaps and remove `assets/` key from each one
+        assets.filter((file) => file.endsWith('.map')).forEach((file) => {
+            const mapFilePath = `${results.directory}/assets/${file}`;
+            const mapFile = JSON.parse(fs.readFileSync(mapFilePath, 'utf8'));
+            // loop over the sources and remove `assets/` from each one
+            mapFile.sources = mapFile.sources.map((source) => source.replace('assets/', ''));
+            fs.writeFileSync(mapFilePath, JSON.stringify(mapFile));
+        });
+
+        // copy the assets to assetsOut
         assets.forEach(function (relativePath) {
             if (relativePath.slice(-1) === '/') { return; }
 
diff --git a/ghost/admin/package.json b/ghost/admin/package.json
index 3bc7b4c3c84..acf4dd1a5b5 100644
--- a/ghost/admin/package.json
+++ b/ghost/admin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ghost-admin",
-  "version": "5.70.2",
+  "version": "5.73.1",
   "description": "Ember.js admin client for Ghost",
   "author": "Ghost Foundation",
   "homepage": "http://ghost.org",
@@ -39,19 +39,19 @@
     "@embroider/macros": "1.13.2",
     "@glimmer/component": "1.1.2",
     "@html-next/vertical-collection": "3.0.0",
-    "@sentry/ember": "7.70.0",
-    "@tryghost/color-utils": "0.1.24",
+    "@sentry/ember": "7.78.0",
+    "@tryghost/color-utils": "0.2.0",
     "@tryghost/ember-promise-modals": "2.0.1",
-    "@tryghost/helpers": "1.1.77",
-    "@tryghost/kg-clean-basic-html": "3.0.39",
-    "@tryghost/kg-converters": "0.0.21",
-    "@tryghost/koenig-lexical": "0.5.12",
-    "@tryghost/limit-service": "1.2.10",
+    "@tryghost/helpers": "1.1.88",
+    "@tryghost/kg-clean-basic-html": "3.0.41",
+    "@tryghost/kg-converters": "0.0.22",
+    "@tryghost/koenig-lexical": "0.5.17",
+    "@tryghost/limit-service": "1.2.12",
     "@tryghost/members-csv": "0.0.0",
     "@tryghost/nql": "0.11.0",
     "@tryghost/nql-lang": "0.5.0",
-    "@tryghost/string": "0.2.4",
-    "@tryghost/timezone-data": "0.3.8",
+    "@tryghost/string": "0.2.10",
+    "@tryghost/timezone-data": "0.4.1",
     "autoprefixer": "9.8.6",
     "babel-eslint": "10.1.0",
     "babel-plugin-transform-class-properties": "6.24.1",
@@ -60,7 +60,7 @@
     "broccoli-concat": "4.2.5",
     "broccoli-funnel": "3.0.8",
     "broccoli-merge-trees": "4.2.0",
-    "broccoli-terser-sourcemap": "4.1.0",
+    "broccoli-terser-sourcemap": "4.1.1",
     "chai": "4.3.8",
     "chai-dom": "1.11.0",
     "codemirror": "5.48.2",
@@ -76,7 +76,7 @@
     "ember-cli-chart": "3.7.2",
     "ember-cli-code-coverage": "1.0.3",
     "ember-cli-dependency-checker": "3.3.2",
-    "ember-cli-deprecation-workflow": "2.1.0",
+    "ember-cli-deprecation-workflow": "2.2.0",
     "ember-cli-htmlbars": "6.3.0",
     "ember-cli-inject-live-reload": "2.1.0",
     "ember-cli-mirage": "2.4.0",
@@ -84,7 +84,7 @@
     "ember-cli-postcss": "6.0.1",
     "ember-cli-shims": "1.2.0",
     "ember-cli-string-helpers": "6.1.0",
-    "ember-cli-terser": "4.0.2",
+    "ember-cli-terser": "4.0.1",
     "ember-cli-test-loader": "3.1.0",
     "ember-composable-helpers": "5.0.0",
     "ember-concurrency": "2.3.7",
@@ -150,8 +150,8 @@
   "ember-addon": {
     "paths": [
       "lib/asset-delivery",
-      "lib/ember-power-calendar-utils",
-      "lib/ember-power-calendar-moment"
+      "lib/ember-power-calendar-moment",
+      "lib/ember-power-calendar-utils"
     ]
   },
   "resolutions": {
@@ -199,4 +199,4 @@
       }
     }
   }
-}
+}
\ No newline at end of file
diff --git a/ghost/admin/public/assets/icons/arrow-top-right.svg b/ghost/admin/public/assets/icons/arrow-top-right.svg
index b58a17c0b13..6d725636ff5 100644
--- a/ghost/admin/public/assets/icons/arrow-top-right.svg
+++ b/ghost/admin/public/assets/icons/arrow-top-right.svg
@@ -1,3 +1,4 @@
 <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24">
+  <title>arrow-top-right</title>
   <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M4.25 19.66 20.16 3.75m0 15v-15h-15"/>
 </svg>
\ No newline at end of file
diff --git a/ghost/admin/tests/acceptance/editor-test.js b/ghost/admin/tests/acceptance/editor-test.js
index 9d596fd2181..7cdd12a5df5 100644
--- a/ghost/admin/tests/acceptance/editor-test.js
+++ b/ghost/admin/tests/acceptance/editor-test.js
@@ -235,7 +235,7 @@ describe('Acceptance: Editor', function () {
         });
 
         it('shows author token input and allows changing of authors in PSM', async function () {
-            let adminRole = this.server.create('role', {name: 'Adminstrator'});
+            let adminRole = this.server.create('role', {name: 'Administrator'});
             let authorRole = this.server.create('role', {name: 'Author'});
             let user1 = this.server.create('user', {name: 'Primary', roles: [adminRole]});
             this.server.create('user', {name: 'Waldo', roles: [authorRole]});
diff --git a/ghost/admin/tests/acceptance/settings/amp-test.js b/ghost/admin/tests/acceptance/settings/amp-test.js
deleted file mode 100644
index 46e5ec8ad24..00000000000
--- a/ghost/admin/tests/acceptance/settings/amp-test.js
+++ /dev/null
@@ -1,130 +0,0 @@
-// import ctrlOrCmd from 'ghost-admin/utils/ctrl-or-cmd';
-// import {authenticateSession, invalidateSession} from 'ember-simple-auth/test-support';
-// import {
-//     beforeEach,
-//     describe,
-//     it
-// } from 'mocha';
-// import {click, currentURL, find, findAll, triggerEvent} from '@ember/test-helpers';
-// import {expect} from 'chai';
-// import {setupApplicationTest} from 'ember-mocha';
-// import {setupMirage} from 'ember-cli-mirage/test-support';
-// import {visit} from '../../helpers/visit';
-
-// describe('Acceptance: Settings - Integrations - AMP', function () {
-//     let hooks = setupApplicationTest();
-//     setupMirage(hooks);
-
-//     it('redirects to signin when not authenticated', async function () {
-//         await invalidateSession();
-//         await visit('/settings/integrations/amp');
-
-//         expect(currentURL(), 'currentURL').to.equal('/signin');
-//     });
-
-//     it('redirects to home page when authenticated as contributor', async function () {
-//         let role = this.server.create('role', {name: 'Contributor'});
-//         this.server.create('user', {roles: [role], slug: 'test-user'});
-
-//         await authenticateSession();
-//         await visit('/settings/integrations/amp');
-
-//         expect(currentURL(), 'currentURL').to.equal('/posts');
-//     });
-
-//     it('redirects to home page when authenticated as author', async function () {
-//         let role = this.server.create('role', {name: 'Author'});
-//         this.server.create('user', {roles: [role], slug: 'test-user'});
-
-//         await authenticateSession();
-//         await visit('/settings/integrations/amp');
-
-//         expect(currentURL(), 'currentURL').to.equal('/site');
-//     });
-
-//     it('redirects to home page when authenticated as editor', async function () {
-//         let role = this.server.create('role', {name: 'Editor'});
-//         this.server.create('user', {roles: [role], slug: 'test-user'});
-
-//         await authenticateSession();
-//         await visit('/settings/integrations/amp');
-
-//         expect(currentURL(), 'currentURL').to.equal('/site');
-//     });
-
-//     describe('when logged in', function () {
-//         beforeEach(async function () {
-//             let role = this.server.create('role', {name: 'Administrator'});
-//             this.server.create('user', {roles: [role]});
-
-//             return await authenticateSession();
-//         });
-
-//         it('it enables or disables AMP properly and saves it', async function () {
-//             await visit('/settings/integrations/amp');
-
-//             // has correct url
-//             expect(currentURL(), 'currentURL').to.equal('/settings/integrations/amp');
-
-//             // AMP is disabled by default
-//             expect(find('[data-test-amp-checkbox]').checked, 'AMP checkbox').to.be.false;
-
-//             await click('[data-test-amp-checkbox]');
-
-//             expect(find('[data-test-amp-checkbox]').checked, 'AMP checkbox').to.be.true;
-
-//             await click('[data-test-save-button]');
-
-//             let [lastRequest] = this.server.pretender.handledRequests.slice(-1);
-//             let params = JSON.parse(lastRequest.requestBody);
-
-//             expect(params.settings.findBy('key', 'amp').value).to.equal(true);
-
-//             // CMD-S shortcut works
-//             await click('[data-test-amp-checkbox]');
-//             await triggerEvent('.gh-app', 'keydown', {
-//                 keyCode: 83, // s
-//                 metaKey: ctrlOrCmd === 'command',
-//                 ctrlKey: ctrlOrCmd === 'ctrl'
-//             });
-
-//             // we've already saved in this test so there's no on-screen indication
-//             // that we've had another save, check the request was fired instead
-//             let [newRequest] = this.server.pretender.handledRequests.slice(-1);
-//             params = JSON.parse(newRequest.requestBody);
-
-//             expect(find('[data-test-amp-checkbox]').checked, 'AMP checkbox').to.be.false;
-//             expect(params.settings.findBy('key', 'amp').value).to.equal(false);
-//         });
-
-//         it('warns when leaving without saving', async function () {
-//             await visit('/settings/integrations/amp');
-
-//             // has correct url
-//             expect(currentURL(), 'currentURL').to.equal('/settings/integrations/amp');
-
-//             // AMP is disabled by default
-//             expect(find('[data-test-amp-checkbox]').checked, 'AMP checkbox default').to.be.false;
-
-//             await click('[data-test-amp-checkbox]');
-
-//             expect(find('[data-test-amp-checkbox]').checked, 'AMP checkbox after click').to.be.true;
-
-//             await visit('/settings/staff');
-
-//             expect(findAll('[data-test-modal="unsaved-settings"]').length, 'unsaved changes modal exists').to.equal(1);
-
-//             // Leave without saving
-//             await click('[data-test-leave-button]');
-
-//             expect(currentURL(), 'currentURL after leave without saving').to.equal('/settings/staff');
-
-//             await visit('/settings/integrations/amp');
-
-//             expect(currentURL(), 'currentURL after return').to.equal('/settings/integrations/amp');
-
-//             // settings were not saved
-//             expect(find('[data-test-amp-checkbox]').checked, 'AMP checkbox').to.be.false;
-//         });
-//     });
-// });
diff --git a/ghost/admin/tests/acceptance/settings/analytics-test.js b/ghost/admin/tests/acceptance/settings/analytics-test.js
deleted file mode 100644
index e19e7dbcd80..00000000000
--- a/ghost/admin/tests/acceptance/settings/analytics-test.js
+++ /dev/null
@@ -1,80 +0,0 @@
-// import {authenticateSession} from 'ember-simple-auth/test-support';
-// import {click, find} from '@ember/test-helpers';
-// import {expect} from 'chai';
-// import {setupApplicationTest} from 'ember-mocha';
-// import {setupMirage} from 'ember-cli-mirage/test-support';
-// import {visit} from '../../helpers/visit';
-
-// describe('Acceptance: Settings - Analytics', function () {
-//     const hooks = setupApplicationTest();
-//     setupMirage(hooks);
-
-//     beforeEach(async function () {
-//         this.server.loadFixtures('configs', 'newsletters');
-
-//         const role = this.server.create('role', {name: 'Owner'});
-//         this.server.create('user', {roles: [role]});
-
-//         return await authenticateSession();
-//     });
-
-//     it('can manage open rate tracking', async function () {
-//         this.server.db.settings.update({key: 'email_track_opens'}, {value: 'true'});
-
-//         await visit('/settings/analytics');
-
-//         expect(find('[data-test-checkbox="email-track-opens"]')).to.be.checked;
-
-//         await click('[data-test-label="email-track-opens"]');
-//         expect(find('[data-test-checkbox="email-track-opens"]')).to.not.be.checked;
-
-//         await click('[data-test-button="save-analytics-settings"]');
-
-//         expect(this.server.db.settings.findBy({key: 'email_track_opens'}).value).to.equal(false);
-//     });
-
-//     it('can manage click tracking', async function () {
-//         this.server.db.settings.update({key: 'email_track_clicks'}, {value: 'true'});
-
-//         await visit('/settings/analytics');
-
-//         expect(find('[data-test-checkbox="email-track-clicks"]')).to.be.checked;
-
-//         await click('[data-test-label="email-track-clicks"]');
-//         expect(find('[data-test-checkbox="email-track-clicks"]')).to.not.be.checked;
-
-//         await click('[data-test-button="save-analytics-settings"]');
-
-//         expect(this.server.db.settings.findBy({key: 'email_track_clicks'}).value).to.equal(false);
-//     });
-
-//     it('can manage source tracking', async function () {
-//         this.server.db.settings.update({key: 'members_track_sources'}, {value: 'true'});
-
-//         await visit('/settings/analytics');
-
-//         expect(find('[data-test-checkbox="members-track-sources"]')).to.be.checked;
-
-//         await click('[data-test-label="members-track-sources"]');
-//         expect(find('[data-test-checkbox="members-track-sources"]')).to.not.be.checked;
-
-//         await click('[data-test-button="save-analytics-settings"]');
-
-//         expect(this.server.db.settings.findBy({key: 'members_track_sources'}).value).to.equal(false);
-//     });
-
-//     it('can manage outbound link tagging', async function () {
-//         this.server.db.settings.update({key: 'outbound_link_tagging'}, {value: 'true'});
-
-//         await visit('/settings/analytics');
-
-//         expect(find('[data-test-checkbox="outbound-link-tagging"]')).to.be.checked;
-
-//         await click('[data-test-label="outbound-link-tagging"]');
-//         expect(find('[data-test-checkbox="outbound-link-tagging"]')).to.not.be.checked;
-
-//         await click('[data-test-button="save-analytics-settings"]');
-
-//         expect(this.server.db.settings.findBy({key: 'outbound_link_tagging'}).value).to.equal(false);
-//     });
-// });
diff --git a/ghost/admin/tests/acceptance/settings/code-injection-test.js b/ghost/admin/tests/acceptance/settings/code-injection-test.js
deleted file mode 100644
index 05d7d0db8a1..00000000000
--- a/ghost/admin/tests/acceptance/settings/code-injection-test.js
+++ /dev/null
@@ -1,113 +0,0 @@
-// import ctrlOrCmd from 'ghost-admin/utils/ctrl-or-cmd';
-// import {authenticateSession, invalidateSession} from 'ember-simple-auth/test-support';
-// import {
-//     beforeEach,
-//     describe,
-//     it
-// } from 'mocha';
-// import {click, currentURL, fillIn, find, findAll, triggerEvent} from '@ember/test-helpers';
-// import {expect} from 'chai';
-// import {setupApplicationTest} from 'ember-mocha';
-// import {setupMirage} from 'ember-cli-mirage/test-support';
-// import {visit} from '../../helpers/visit';
-
-// describe('Acceptance: Settings - Code-Injection', function () {
-//     let hooks = setupApplicationTest();
-//     setupMirage(hooks);
-
-//     it('redirects to signin when not authenticated', async function () {
-//         await invalidateSession();
-//         await visit('/settings/code-injection');
-
-//         expect(currentURL(), 'currentURL').to.equal('/signin');
-//     });
-
-//     it('redirects to home page when authenticated as contributor', async function () {
-//         let role = this.server.create('role', {name: 'Contributor'});
-//         this.server.create('user', {roles: [role], slug: 'test-user'});
-
-//         await authenticateSession();
-//         await visit('/settings/code-injection');
-
-//         expect(currentURL(), 'currentURL').to.equal('/posts');
-//     });
-
-//     it('redirects to staff page when authenticated as author', async function () {
-//         let role = this.server.create('role', {name: 'Author'});
-//         this.server.create('user', {roles: [role], slug: 'test-user'});
-
-//         await authenticateSession();
-//         await visit('/settings/code-injection');
-
-//         expect(currentURL(), 'currentURL').to.equal('/site');
-//     });
-
-//     it('redirects to home page when authenticated as editor', async function () {
-//         let role = this.server.create('role', {name: 'Editor'});
-//         this.server.create('user', {roles: [role], slug: 'test-user'});
-
-//         await authenticateSession();
-//         await visit('/settings/code-injection');
-
-//         expect(currentURL(), 'currentURL').to.equal('/site');
-//     });
-
-//     describe('when logged in', function () {
-//         beforeEach(async function () {
-//             let role = this.server.create('role', {name: 'Administrator'});
-//             this.server.create('user', {roles: [role]});
-
-//             return await authenticateSession();
-//         });
-
-//         it('it renders, loads and saves editors correctly', async function () {
-//             await visit('/settings/code-injection');
-
-//             // has correct url
-//             expect(currentURL(), 'currentURL').to.equal('/settings/code-injection');
-
-//             // has correct page title
-//             expect(document.title, 'page title').to.equal('Settings - Code injection - Test Blog');
-
-//             expect(find('[data-test-save-button]').textContent.trim(), 'save button text').to.equal('Save');
-
-//             expect(findAll('#ghost-head .CodeMirror').length, 'ghost head codemirror element').to.equal(1);
-//             expect(find('#ghost-head .CodeMirror'), 'ghost head editor theme').to.have.class('cm-s-xq-light');
-
-//             expect(findAll('#ghost-foot .CodeMirror').length, 'ghost head codemirror element').to.equal(1);
-//             expect(find('#ghost-foot .CodeMirror'), 'ghost head editor theme').to.have.class('cm-s-xq-light');
-
-//             await fillIn('#settings-code #ghost-head textarea', 'Test');
-
-//             await click('[data-test-save-button]');
-
-//             let [lastRequest] = this.server.pretender.handledRequests.slice(-1);
-//             let params = JSON.parse(lastRequest.requestBody);
-
-//             expect(params.settings.findBy('key', 'codeinjection_head').value).to.equal('Test');
-//             // update should have been partial
-//             expect(params.settings.findBy('key', 'navigation')).to.be.undefined;
-//             expect(find('[data-test-save-button]').textContent.trim(), 'save button text').to.equal('Save');
-
-//             await fillIn('#settings-code #ghost-head textarea', '');
-
-//             // CMD-S shortcut works
-//             await triggerEvent('.gh-app', 'keydown', {
-//                 keyCode: 83, // s
-//                 metaKey: ctrlOrCmd === 'command',
-//                 ctrlKey: ctrlOrCmd === 'ctrl'
-//             });
-
-//             let [newRequest] = this.server.pretender.handledRequests.slice(-1);
-//             params = JSON.parse(newRequest.requestBody);
-
-//             expect(params.settings.findBy('key', 'codeinjection_head').value).to.equal('');
-//             expect(find('[data-test-save-button]').textContent.trim(), 'save button text').to.equal('Save');
-
-//             // Saving when no changed have been made should work
-//             // (although no api request is expected)
-//             await click('[data-test-save-button]');
-//             expect(find('[data-test-save-button]').textContent.trim(), 'save button text').to.equal('Save');
-//         });
-//     });
-// });
diff --git a/ghost/admin/tests/acceptance/settings/design-test.js b/ghost/admin/tests/acceptance/settings/design-test.js
deleted file mode 100644
index 1cb5ee351ae..00000000000
--- a/ghost/admin/tests/acceptance/settings/design-test.js
+++ /dev/null
@@ -1,159 +0,0 @@
-// import {authenticateSession, invalidateSession} from 'ember-simple-auth/test-support';
-// import {click, currentURL, fillIn, find, findAll} from '@ember/test-helpers';
-// import {expect} from 'chai';
-// import {fileUpload} from '../../helpers/file-upload';
-// import {setupApplicationTest} from 'ember-mocha';
-// import {setupMirage} from 'ember-cli-mirage/test-support';
-// import {visit} from '../../helpers/visit';
-
-// describe('Acceptance: Settings - Design', function () {
-//     let hooks = setupApplicationTest();
-//     setupMirage(hooks);
-
-//     beforeEach(async function () {
-//         let role = this.server.create('role', {name: 'Administrator'});
-//         this.server.create('user', {roles: [role]});
-
-//         this.server.loadFixtures('themes');
-
-//         return await authenticateSession();
-//     });
-
-//     it('redirects to signin when not authenticated', async function () {
-//         await invalidateSession();
-//         await visit('/settings/general');
-
-//         expect(currentURL(), 'currentURL').to.equal('/signin');
-//     });
-
-//     it('renders with no custom theme settings', async function () {
-//         await visit('/settings');
-//         await click('[data-test-nav="design"]');
-
-//         expect(currentURL(), 'currentURL').to.equal('/settings/design');
-//         expect(document.title, 'page title').to.equal('Settings - Design - Test Blog');
-
-//         // side nav menu changes
-//         expect(find('[data-test-nav-menu="design"]'), 'design menu').to.exist;
-//         expect(find('[data-test-nav-menu="main"]'), 'main menu').to.not.exist;
-
-//         // side nav defaults to general group open
-//         expect(find('[data-test-nav-toggle="general"]'), 'general toggle').to.exist;
-//         expect(find('[data-test-nav-group="general"]'), 'general form').to.exist;
-
-//         // no other side nav groups exist
-//         expect(findAll('[data-test-nav-toggle]'), 'no of group toggles').to.have.lengthOf(1);
-//         expect(findAll('[data-test-nav-group]'), 'no of groups open').to.have.lengthOf(1);
-
-//         // current theme is shown in nav menu
-//         expect(find('[data-test-text="current-theme"]')).to.contain.text('source - v1.0');
-
-//         // defaults to "home" desktop preview
-//         expect(find('[data-test-button="desktop-preview"]')).to.have.class('gh-btn-group-selected');
-//         expect(find('[data-test-button="mobile-preview"]')).to.not.have.class('gh-btn-group-selected');
-//     });
-
-//     it('has unsaved-changes confirmation', async function () {
-//         await visit('/settings/design');
-//         await fillIn('[data-test-input="siteDescription"]', 'Changed');
-//         await click('[data-test-link="back-to-settings"]');
-
-//         expect(find('[data-test-modal="unsaved-settings"]')).to.exist;
-
-//         await click('[data-test-modal="unsaved-settings"] [data-test-button="close"]');
-
-//         expect(currentURL()).to.equal('/settings/design');
-
-//         await click('[data-test-link="back-to-settings"]');
-//         await click('[data-test-modal="unsaved-settings"] [data-test-leave-button]');
-
-//         expect(currentURL()).to.equal('/settings');
-
-//         await click('[data-test-nav="design"]');
-
-//         expect(find('[data-test-input="siteDescription"]')).to.not.have.value('Changed');
-//     });
-
-//     it('renders with custom theme settings');
-
-//     it('can install an official theme', async function () {
-//         await visit('/settings/design');
-//         await click('[data-test-nav="change-theme"]');
-//         expect(currentURL(), 'currentURL').to.equal('/settings/design/change-theme');
-
-//         await click('[data-test-theme-link="Journal"]');
-//         expect(currentURL(), 'currentURL').to.equal('/settings/design/change-theme/Journal');
-
-//         await click('[data-test-button="install-theme"]');
-//         expect(find('[data-test-modal="install-theme"]'), 'install-theme modal').to.exist;
-//         expect(find('[data-test-state="confirm"]'), 'confirm state').to.exist;
-//         expect(findAll('[data-test-state]').length, 'state count').to.equal(1);
-
-//         await click('[data-test-button="confirm-install"]');
-//         expect(find('[data-test-state="installed-no-notes"]'), 'success state').to.exist;
-//         expect(findAll('[data-test-state]').length, 'state count').to.equal(1);
-
-//         // navigates back to design screen in background
-//         expect(currentURL(), 'currentURL').to.equal('/settings/design');
-
-//         await click('[data-test-button="cancel"]');
-//         expect(find('[data-test-modal="install-theme"]')).to.not.exist;
-
-//         // nav menu shows current theme
-//         expect(find('[data-test-text="current-theme"]')).to.contain.text('Journal - v0.1');
-//     });
-
-//     it('can upload custom theme', async function () {
-//         this.server.post('/themes/upload/', function ({themes}) {
-//             const theme = themes.create({
-//                 name: 'custom',
-//                 package: {
-//                     name: 'Custom',
-//                     version: '1.0'
-//                 }
-//             });
-
-//             return {themes: [theme]};
-//         });
-
-//         await visit('/settings/design/change-theme');
-//         await click('[data-test-button="upload-theme"]');
-
-//         expect(find('[data-test-modal="upload-theme"]'), 'upload-theme modal').to.exist;
-
-//         await fileUpload('[data-test-modal="upload-theme"] input[type="file"]', ['test'], {name: 'valid-theme.zip', type: 'application/zip'});
-
-//         expect(find('[data-test-state="installed-no-notes"]'), 'success state').to.exist;
-//         expect(currentURL(), 'url after upload').to.equal('/settings/design/change-theme');
-
-//         await click('[data-test-button="activate"]');
-
-//         expect(currentURL(), 'url after activate').to.equal('/settings/design');
-//         expect(find('[data-test-modal="install-theme"]')).to.not.exist;
-//         expect(find('[data-test-text="current-theme"]')).to.contain.text('custom - v1.0');
-//     });
-
-//     it('can change between installed themes');
-//     it('can delete installed theme');
-
-//     describe('limits', function () {
-//         it('displays upgrade notice when custom themes are not allowed', async function () {
-//             this.server.loadFixtures('configs');
-//             const config = this.server.db.configs.find(1);
-//             config.hostSettings = {
-//                 limits: {
-//                     customThemes: {
-//                         allowlist: ['source', 'casper', 'dawn', 'lyra'],
-//                         error: 'All our official built-in themes are available the Starter plan, if you upgrade to one of our higher tiers you will also be able to edit and upload custom themes for your site.'
-//                     }
-//                 }
-//             };
-//             this.server.db.configs.update(1, config);
-
-//             await visit('/settings/design/change-theme');
-//             await click('[data-test-button="upload-theme"]');
-
-//             expect(find('[data-test-modal="limits/custom-theme"]'), 'limits/custom-theme modal').to.exist;
-//         });
-//     });
-// });
diff --git a/ghost/admin/tests/acceptance/settings/general-test.js b/ghost/admin/tests/acceptance/settings/general-test.js
deleted file mode 100644
index fa900fdc68e..00000000000
--- a/ghost/admin/tests/acceptance/settings/general-test.js
+++ /dev/null
@@ -1,291 +0,0 @@
-// import {authenticateSession, invalidateSession} from 'ember-simple-auth/test-support';
-// import {beforeEach, describe, it} from 'mocha';
-// import {blur, click, currentURL, fillIn, find, findAll, focus, triggerEvent} from '@ember/test-helpers';
-// import {expect} from 'chai';
-// import {keyDown} from 'ember-keyboard/test-support/test-helpers';
-// import {setupApplicationTest} from 'ember-mocha';
-// import {setupMirage} from 'ember-cli-mirage/test-support';
-// import {visit} from '../../helpers/visit';
-
-// describe('Acceptance: Settings - General', function () {
-//     let hooks = setupApplicationTest();
-//     setupMirage(hooks);
-
-//     it('redirects to signin when not authenticated', async function () {
-//         await invalidateSession();
-//         await visit('/settings/general');
-
-//         expect(currentURL(), 'currentURL').to.equal('/signin');
-//     });
-
-//     it('redirects to home page when authenticated as contributor', async function () {
-//         let role = this.server.create('role', {name: 'Contributor'});
-//         this.server.create('user', {roles: [role], slug: 'test-user'});
-
-//         await authenticateSession();
-//         await visit('/settings/general');
-
-//         expect(currentURL(), 'currentURL').to.equal('/posts');
-//     });
-
-//     it('redirects to home page when authenticated as author', async function () {
-//         let role = this.server.create('role', {name: 'Author'});
-//         this.server.create('user', {roles: [role], slug: 'test-user'});
-
-//         await authenticateSession();
-//         await visit('/settings/general');
-
-//         expect(currentURL(), 'currentURL').to.equal('/site');
-//     });
-
-//     it('redirects to home page when authenticated as editor', async function () {
-//         let role = this.server.create('role', {name: 'Editor'});
-//         this.server.create('user', {roles: [role], slug: 'test-user'});
-
-//         await authenticateSession();
-//         await visit('/settings/general');
-
-//         expect(currentURL(), 'currentURL').to.equal('/site');
-//     });
-
-//     describe('when logged in', function () {
-//         beforeEach(async function () {
-//             let role = this.server.create('role', {name: 'Administrator'});
-//             this.server.create('user', {roles: [role]});
-
-//             return await authenticateSession();
-//         });
-
-//         it('it renders, handles image uploads', async function () {
-//             await visit('/settings/general');
-
-//             // has correct url
-//             expect(currentURL(), 'currentURL').to.equal('/settings/general');
-
-//             // has correct page title
-//             expect(document.title, 'page title').to.equal('Settings - General - Test Blog');
-
-//             // highlights nav menu
-//             expect(find('[data-test-nav="settings"]'), 'highlights nav menu item')
-//                 .to.have.class('active');
-
-//             expect(
-//                 find('[data-test-button="save"]').textContent.trim(),
-//                 'save button text'
-//             ).to.equal('Save');
-
-//             await click('[data-test-toggle-pub-info]');
-//             await fillIn('[data-test-title-input]', 'New Blog Title');
-//             await click('[data-test-button="save"]');
-//             expect(document.title, 'page title').to.equal('Settings - General - New Blog Title');
-
-//             // CMD-S shortcut works
-//             // -------------------------------------------------------------- //
-//             await fillIn('[data-test-title-input]', 'CMD-S Test');
-//             await keyDown('cmd+s');
-//             // we've already saved in this test so there's no on-screen indication
-//             // that we've had another save, check the request was fired instead
-//             let [lastRequest] = this.server.pretender.handledRequests.slice(-1);
-//             let params = JSON.parse(lastRequest.requestBody);
-//             expect(params.settings.findBy('key', 'title').value).to.equal('CMD-S Test');
-//         });
-
-//         it('renders timezone selector correctly', async function () {
-//             await visit('/settings/general');
-//             await click('[data-test-toggle-timezone]');
-
-//             expect(currentURL(), 'currentURL').to.equal('/settings/general');
-
-//             expect(findAll('#timezone option').length, 'available timezones').to.equal(66);
-//             expect(find('#timezone option:checked').textContent.trim()).to.equal('(GMT) UTC');
-//             find('#timezone option[value="Africa/Cairo"]').selected = true;
-
-//             await triggerEvent('#timezone', 'change');
-//             await click('[data-test-button="save"]');
-//             expect(find('#timezone option:checked').textContent.trim()).to.equal('(GMT +2:00) Cairo, Egypt');
-//         });
-
-//         it('handles private blog settings correctly', async function () {
-//             await visit('/settings/general');
-
-//             // handles private blog settings correctly
-//             expect(find('[data-test-private-checkbox]').checked, 'isPrivate checkbox').to.be.false;
-
-//             await click('[data-test-private-checkbox]');
-
-//             expect(find('[data-test-private-checkbox]').checked, 'isPrivate checkbox').to.be.true;
-//             expect(findAll('[data-test-password-input]').length, 'password input').to.equal(1);
-//             expect(find('[data-test-password-input]').value, 'password default value').to.not.equal('');
-
-//             await fillIn('[data-test-password-input]', '');
-//             await blur('[data-test-password-input]');
-
-//             expect(find('[data-test-password-error]').textContent.trim(), 'empty password error')
-//                 .to.equal('Password must be supplied');
-
-//             await fillIn('[data-test-password-input]', 'asdfg');
-//             await blur('[data-test-password-input]');
-
-//             expect(find('[data-test-password-error]').textContent.trim(), 'present password error')
-//                 .to.equal('');
-//         });
-
-//         it('handles social blog settings correctly', async function () {
-//             let testSocialInput = async function (type, input, expectedValue, expectedError = '') {
-//                 await fillIn(`[data-test-${type}-input]`, input);
-//                 await blur(`[data-test-${type}-input]`);
-
-//                 expect(
-//                     find(`[data-test-${type}-input]`).value,
-//                     `${type} value for ${input}`
-//                 ).to.equal(expectedValue);
-
-//                 expect(
-//                     find(`[data-test-${type}-error]`).textContent.trim(),
-//                     `${type} validation response for ${input}`
-//                 ).to.equal(expectedError);
-
-//                 expect(
-//                     find(`[data-test-${type}-input]`).closest('.form-group').classList.contains('error'),
-//                     `${type} input should be in error state with '${input}'`
-//                 ).to.equal(!!expectedError);
-//             };
-
-//             let testFacebookValidation = async (...args) => testSocialInput('facebook', ...args);
-//             let testTwitterValidation = async (...args) => testSocialInput('twitter', ...args);
-
-//             await visit('/settings/general');
-//             await click('[data-test-toggle-social]');
-
-//             // validates a facebook url correctly
-//             // loads fixtures and performs transform
-//             expect(find('[data-test-facebook-input]').value, 'initial facebook value')
-//                 .to.equal('https://www.facebook.com/test');
-
-//             await focus('[data-test-facebook-input]');
-//             await blur('[data-test-facebook-input]');
-
-//             // regression test: we still have a value after the input is
-//             // focused and then blurred without any changes
-//             expect(find('[data-test-facebook-input]').value, 'facebook value after blur with no change')
-//                 .to.equal('https://www.facebook.com/test');
-
-//             await testFacebookValidation(
-//                 'facebook.com/username',
-//                 'https://www.facebook.com/username');
-
-//             await testFacebookValidation(
-//                 'testuser',
-//                 'https://www.facebook.com/testuser');
-
-//             await testFacebookValidation(
-//                 'ab99',
-//                 'https://www.facebook.com/ab99');
-
-//             await testFacebookValidation(
-//                 'page/ab99',
-//                 'https://www.facebook.com/page/ab99');
-
-//             await testFacebookValidation(
-//                 'page/*(&*(%%))',
-//                 'https://www.facebook.com/page/*(&*(%%))');
-
-//             await testFacebookValidation(
-//                 'facebook.com/pages/some-facebook-page/857469375913?ref=ts',
-//                 'https://www.facebook.com/pages/some-facebook-page/857469375913?ref=ts');
-
-//             await testFacebookValidation(
-//                 'https://www.facebook.com/groups/savethecrowninn',
-//                 'https://www.facebook.com/groups/savethecrowninn');
-
-//             await testFacebookValidation(
-//                 'http://github.com/username',
-//                 'http://github.com/username',
-//                 'The URL must be in a format like https://www.facebook.com/yourPage');
-
-//             await testFacebookValidation(
-//                 'http://github.com/pages/username',
-//                 'http://github.com/pages/username',
-//                 'The URL must be in a format like https://www.facebook.com/yourPage');
-
-//             // validates a twitter url correctly
-
-//             // loads fixtures and performs transform
-//             expect(find('[data-test-twitter-input]').value, 'initial twitter value')
-//                 .to.equal('https://twitter.com/test');
-
-//             await focus('[data-test-twitter-input]');
-//             await blur('[data-test-twitter-input]');
-
-//             // regression test: we still have a value after the input is
-//             // focused and then blurred without any changes
-//             expect(find('[data-test-twitter-input]').value, 'twitter value after blur with no change')
-//                 .to.equal('https://twitter.com/test');
-
-//             await testTwitterValidation(
-//                 'twitter.com/username',
-//                 'https://twitter.com/username');
-
-//             await testTwitterValidation(
-//                 'testuser',
-//                 'https://twitter.com/testuser');
-
-//             await testTwitterValidation(
-//                 'http://github.com/username',
-//                 'https://twitter.com/username');
-
-//             await testTwitterValidation(
-//                 '*(&*(%%))',
-//                 '*(&*(%%))',
-//                 'The URL must be in a format like https://twitter.com/yourUsername');
-
-//             await testTwitterValidation(
-//                 'thisusernamehasmorethan15characters',
-//                 'thisusernamehasmorethan15characters',
-//                 'Your Username is not a valid Twitter Username');
-//         });
-
-//         it('warns when leaving without saving', async function () {
-//             await visit('/settings/general');
-
-//             expect(
-//                 find('[data-test-private-checkbox]').checked,
-//                 'private blog checkbox'
-//             ).to.be.false;
-
-//             await click('[data-test-toggle-pub-info]');
-//             await fillIn('[data-test-title-input]', 'New Blog Title');
-
-//             await click('[data-test-private-checkbox]');
-
-//             expect(
-//                 find('[data-test-private-checkbox]').checked,
-//                 'private blog checkbox'
-//             ).to.be.true;
-
-//             await visit('/settings/staff');
-
-//             expect(findAll('[data-test-modal="unsaved-settings"]').length, 'modal exists').to.equal(1);
-
-//             // Leave without saving
-//             await click('[data-test-leave-button]');
-
-//             expect(currentURL(), 'currentURL').to.equal('/settings/staff');
-
-//             await visit('/settings/general');
-
-//             expect(currentURL(), 'currentURL').to.equal('/settings/general');
-
-//             // settings were not saved
-//             expect(
-//                 find('[data-test-private-checkbox]').checked,
-//                 'private blog checkbox'
-//             ).to.be.false;
-
-//             expect(
-//                 find('[data-test-title-input]').textContent.trim(),
-//                 'Blog title'
-//             ).to.equal('');
-//         });
-//     });
-// });
diff --git a/ghost/admin/tests/acceptance/settings/integrations-test.js b/ghost/admin/tests/acceptance/settings/integrations-test.js
deleted file mode 100644
index 8943709f3d6..00000000000
--- a/ghost/admin/tests/acceptance/settings/integrations-test.js
+++ /dev/null
@@ -1,512 +0,0 @@
-// import {authenticateSession, invalidateSession} from 'ember-simple-auth/test-support';
-// import {beforeEach, describe, it} from 'mocha';
-// import {blur, click, currentRouteName, currentURL, fillIn, find, findAll} from '@ember/test-helpers';
-// import {expect} from 'chai';
-// import {setupApplicationTest} from 'ember-mocha';
-// import {setupMirage} from 'ember-cli-mirage/test-support';
-// import {visit} from '../../helpers/visit';
-
-// describe('Acceptance: Settings - Integrations - Custom', function () {
-//     let hooks = setupApplicationTest();
-//     setupMirage(hooks);
-
-//     describe('access permissions', function () {
-//         beforeEach(function () {
-//             this.server.create('integration', {name: 'Test'});
-//         });
-
-//         it('redirects /integrations/ to signin when not authenticated', async function () {
-//             await invalidateSession();
-//             await visit('/settings/integrations');
-
-//             expect(currentURL(), 'currentURL').to.equal('/signin');
-//         });
-
-//         it('redirects /integrations/ to home page when authenticated as contributor', async function () {
-//             let role = this.server.create('role', {name: 'Contributor'});
-//             this.server.create('user', {roles: [role], slug: 'test-user'});
-
-//             await authenticateSession();
-//             await visit('/settings/integrations');
-
-//             expect(currentURL(), 'currentURL').to.equal('/posts');
-//         });
-
-//         it('redirects /integrations/ to home page when authenticated as author', async function () {
-//             let role = this.server.create('role', {name: 'Author'});
-//             this.server.create('user', {roles: [role], slug: 'test-user'});
-
-//             await authenticateSession();
-//             await visit('/settings/integrations');
-
-//             expect(currentURL(), 'currentURL').to.equal('/site');
-//         });
-
-//         it('redirects /integrations/ to home page when authenticated as editor', async function () {
-//             let role = this.server.create('role', {name: 'Editor'});
-//             this.server.create('user', {roles: [role], slug: 'test-user'});
-
-//             await authenticateSession();
-//             await visit('/settings/integrations/1');
-
-//             expect(currentURL(), 'currentURL').to.equal('/site');
-//         });
-
-//         it('redirects /integrations/:id/ to signin when not authenticated', async function () {
-//             await invalidateSession();
-//             await visit('/settings/integrations/1');
-
-//             expect(currentURL(), 'currentURL').to.equal('/signin');
-//         });
-
-//         it('redirects /integrations/:id/ to home page when authenticated as contributor', async function () {
-//             let role = this.server.create('role', {name: 'Contributor'});
-//             this.server.create('user', {roles: [role], slug: 'test-user'});
-
-//             await authenticateSession();
-//             await visit('/settings/integrations/1');
-
-//             expect(currentURL(), 'currentURL').to.equal('/posts');
-//         });
-
-//         it('redirects /integrations/:id/ to home page when authenticated as author', async function () {
-//             let role = this.server.create('role', {name: 'Author'});
-//             this.server.create('user', {roles: [role], slug: 'test-user'});
-
-//             await authenticateSession();
-//             await visit('/settings/integrations/1');
-
-//             expect(currentURL(), 'currentURL').to.equal('/site');
-//         });
-
-//         it('redirects /integrations/:id/ to home page when authenticated as editor', async function () {
-//             let role = this.server.create('role', {name: 'Editor'});
-//             this.server.create('user', {roles: [role], slug: 'test-user'});
-
-//             await authenticateSession();
-//             await visit('/settings/integrations/1');
-
-//             expect(currentURL(), 'currentURL').to.equal('/site');
-//         });
-//     });
-
-//     describe('navigation', function () {
-//         beforeEach(async function () {
-//             this.server.loadFixtures('settings');
-
-//             let role = this.server.create('role', {name: 'Administrator'});
-//             this.server.create('user', {roles: [role]});
-
-//             return await authenticateSession();
-//         });
-
-//         it('renders defaults correctly', async function () {
-//             await visit('/settings/integrations');
-
-//             // slack is not configured in the fixtures
-//             expect(
-//                 find('[data-test-app="slack"] [data-test-app-status]').textContent.trim(),
-//                 'slack app status'
-//             ).to.equal('Configure');
-
-//             // amp is disabled in the fixtures
-//             expect(
-//                 find('[data-test-app="amp"] [data-test-app-status]').textContent.trim(),
-//                 'amp app status'
-//             ).to.equal('Configure');
-//         });
-
-//         it('renders AMP active state', async function () {
-//             this.server.db.settings.update({key: 'amp', value: true});
-//             await visit('/settings/integrations');
-
-//             // amp switches to active when enabled
-//             expect(
-//                 find('[data-test-app="amp"] [data-test-app-status]').textContent.trim(),
-//                 'amp app status'
-//             ).to.equal('Active');
-//         });
-
-//         it('it redirects to Slack when clicking on the grid', async function () {
-//             await visit('/settings/integrations');
-
-//             // has correct url
-//             expect(currentURL(), 'currentURL').to.equal('/settings/integrations');
-
-//             await click('[data-test-link="slack"]');
-
-//             // has correct url
-//             expect(currentURL(), 'currentURL').to.equal('/settings/integrations/slack');
-//         });
-
-//         it('it redirects to AMP when clicking on the grid', async function () {
-//             await visit('/settings/integrations');
-
-//             // has correct url
-//             expect(currentURL(), 'currentURL').to.equal('/settings/integrations');
-
-//             await click('[data-test-link="amp"]');
-
-//             // has correct url
-//             expect(currentURL(), 'currentURL').to.equal('/settings/integrations/amp');
-//         });
-
-//         it('it redirects to Unsplash when clicking on the grid', async function () {
-//             await visit('/settings/integrations');
-
-//             // has correct url
-//             expect(currentURL(), 'currentURL').to.equal('/settings/integrations');
-
-//             await click('[data-test-link="unsplash"]');
-
-//             // has correct url
-//             expect(currentURL(), 'currentURL').to.equal('/settings/integrations/unsplash');
-//         });
-//     });
-
-//     describe('custom integrations', function () {
-//         beforeEach(async function () {
-//             this.server.loadFixtures('configs');
-//             let config = this.server.schema.configs.first();
-//             config.update({
-//                 enableDeveloperExperiments: true
-//             });
-
-//             let role = this.server.create('role', {name: 'Administrator'});
-//             this.server.create('user', {roles: [role]});
-
-//             return await authenticateSession();
-//         });
-
-//         it('handles 404', async function () {
-//             await visit('/settings/integrations/1');
-//             expect(currentRouteName()).to.equal('error404');
-//         });
-
-//         it('can add new integration', async function () {
-//             // sanity check
-//             expect(
-//                 this.server.db.integrations.length,
-//                 'number of integrations in db at start'
-//             ).to.equal(0);
-//             expect(
-//                 this.server.db.apiKeys.length,
-//                 'number of apiKeys in db at start'
-//             ).to.equal(0);
-
-//             // blank slate
-//             await visit('/settings/integrations');
-
-//             expect(
-//                 find('[data-test-blank="custom-integrations"]'),
-//                 'initial blank slate'
-//             ).to.exist;
-
-//             // new integration modal opens/closes
-//             await click('[data-test-button="new-integration"]');
-
-//             expect(currentURL(), 'url after clicking new').to.equal('/settings/integrations/new');
-//             expect(find('[data-test-modal="new-integration"]'), 'modal after clicking new').to.exist;
-
-//             await click('[data-test-button="cancel-new-integration"]');
-
-//             expect(find('[data-test-modal="new-integration"]'), 'modal after clicking cancel')
-//                 .to.not.exist;
-
-//             expect(
-//                 find('[data-test-blank="custom-integrations"]'),
-//                 'blank slate after cancelled creation'
-//             ).to.exist;
-
-//             // new integration validations
-//             await click('[data-test-button="new-integration"]');
-//             await click('[data-test-button="create-integration"]');
-
-//             expect(
-//                 find('[data-test-error="new-integration-name"]').textContent,
-//                 'name error after create with blank field'
-//             ).to.have.string('enter a name');
-
-//             await fillIn('[data-test-input="new-integration-name"]', 'Duplicate');
-//             await click('[data-test-button="create-integration"]');
-
-//             expect(
-//                 find('[data-test-error="new-integration-name"]').textContent,
-//                 'name error after create with duplicate name'
-//             ).to.have.string('already been used');
-
-//             // successful creation
-//             await fillIn('[data-test-input="new-integration-name"]', 'Test');
-
-//             expect(
-//                 find('[data-test-error="new-integration-name"]').textContent.trim(),
-//                 'name error after typing in field'
-//             ).to.be.empty;
-
-//             await click('[data-test-button="create-integration"]');
-
-//             expect(
-//                 find('[data-test-modal="new-integration"]'),
-//                 'modal after successful create'
-//             ).to.not.exist;
-
-//             expect(
-//                 this.server.db.integrations.length,
-//                 'number of integrations in db after create'
-//             ).to.equal(1);
-//             // mirage sanity check
-//             expect(
-//                 this.server.db.apiKeys.length,
-//                 'number of api keys in db after create'
-//             ).to.equal(2);
-
-//             expect(
-//                 currentURL(),
-//                 'url after integration creation'
-//             ).to.equal('/settings/integrations/1');
-
-//             // test navigation back to list then back to new integration
-//             await click('[data-test-link="integrations-back"]');
-
-//             expect(
-//                 currentURL(),
-//                 'url after clicking "Back"'
-//             ).to.equal('/settings/integrations');
-
-//             expect(
-//                 find('[data-test-blank="custom-integrations"]'),
-//                 'blank slate after creation'
-//             ).to.not.exist;
-
-//             expect(
-//                 findAll('[data-test-custom-integration]').length,
-//                 'number of custom integrations after creation'
-//             ).to.equal(1);
-
-//             await click(`[data-test-integration="1"]`);
-
-//             expect(
-//                 currentURL(),
-//                 'url after clicking integration in list'
-//             ).to.equal('/settings/integrations/1');
-//         });
-
-//         it('can manage an integration', async function () {
-//             this.server.create('integration');
-
-//             await visit('/settings/integrations/1');
-
-//             expect(
-//                 currentURL(),
-//                 'initial URL'
-//             ).to.equal('/settings/integrations/1');
-
-//             expect(
-//                 find('[data-test-screen-title]').textContent,
-//                 'screen title'
-//             ).to.have.string('Integration 1');
-
-//             // fields have expected values
-//             // TODO: add test for logo
-
-//             expect(
-//                 find('[data-test-input="name"]').value,
-//                 'initial name value'
-//             ).to.equal('Integration 1');
-
-//             expect(
-//                 find('[data-test-input="description"]').value,
-//                 'initial description value'
-//             ).to.equal('');
-
-//             expect(
-//                 find('[data-test-text="content-key"]'),
-//                 'content key text'
-//             ).to.have.trimmed.text('integration-1_content_key-12345');
-
-//             expect(
-//                 find('[data-test-text="admin-key"]'),
-//                 'admin key text'
-//             ).to.have.trimmed.text('integration-1_admin_key-12345');
-
-//             expect(
-//                 find('[data-test-text="api-url"]'),
-//                 'api url text'
-//             ).to.have.trimmed.text(window.location.origin);
-
-//             // it can modify integration fields and has validation
-
-//             expect(
-//                 find('[data-test-error="name"]').textContent.trim(),
-//                 'initial name error'
-//             ).to.be.empty;
-
-//             await fillIn('[data-test-input="name"]', '');
-//             await await blur('[data-test-input="name"]');
-
-//             expect(
-//                 find('[data-test-error="name"]').textContent,
-//                 'name validation for blank string'
-//             ).to.have.string('enter a name');
-
-//             await click('[data-test-button="save"]');
-
-//             expect(
-//                 this.server.schema.integrations.first().name,
-//                 'db integration name after failed save'
-//             ).to.equal('Integration 1');
-
-//             await fillIn('[data-test-input="name"]', 'Test Integration');
-//             await await blur('[data-test-input="name"]');
-
-//             expect(
-//                 find('[data-test-error="name"]').textContent.trim(),
-//                 'name error after valid entry'
-//             ).to.be.empty;
-
-//             await fillIn('[data-test-input="description"]', 'Description for Test Integration');
-//             await await blur('[data-test-input="description"]');
-//             await click('[data-test-button="save"]');
-
-//             // changes are reflected in the integrations list
-
-//             await click('[data-test-link="integrations-back"]');
-
-//             expect(
-//                 currentURL(),
-//                 'url after saving and clicking "back"'
-//             ).to.equal('/settings/integrations');
-
-//             expect(
-//                 find('[data-test-integration="1"] [data-test-text="name"]').textContent.trim(),
-//                 'integration name after save'
-//             ).to.equal('Test Integration');
-
-//             expect(
-//                 find('[data-test-integration="1"] [data-test-text="description"]').textContent.trim(),
-//                 'integration description after save'
-//             ).to.equal('Description for Test Integration');
-
-//             await click('[data-test-integration="1"]');
-
-//             // warns of unsaved changes when leaving
-
-//             await fillIn('[data-test-input="name"]', 'Unsaved test');
-//             await click('[data-test-link="integrations-back"]');
-
-//             expect(
-//                 find('[data-test-modal="unsaved-settings"]'),
-//                 'modal shown when navigating with unsaved changes'
-//             ).to.exist;
-
-//             await click('[data-test-stay-button]');
-
-//             expect(
-//                 find('[data-test-modal="unsaved-settings"]'),
-//                 'modal is closed after clicking "stay"'
-//             ).to.not.exist;
-
-//             expect(
-//                 currentURL(),
-//                 'url after clicking "stay"'
-//             ).to.equal('/settings/integrations/1');
-
-//             await click('[data-test-link="integrations-back"]');
-//             await click('[data-test-leave-button]');
-
-//             expect(
-//                 find('[data-test-modal="unsaved-settings"]'),
-//                 'modal is closed after clicking "leave"'
-//             ).to.not.exist;
-
-//             expect(
-//                 currentURL(),
-//                 'url after clicking "leave"'
-//             ).to.equal('/settings/integrations');
-
-//             expect(
-//                 find('[data-test-integration="1"] [data-test-text="name"]').textContent.trim(),
-//                 'integration name after leaving unsaved changes'
-//             ).to.equal('Test Integration');
-//         });
-
-//         it('can manage an integration\'s webhooks', async function () {
-//             this.server.create('integration');
-
-//             await visit('/settings/integrations/1');
-
-//             expect(find('[data-test-webhooks-blank-slate]')).to.exist;
-
-//             // open new webhook modal
-//             await click('[data-test-link="add-webhook"]');
-//             expect(find('[data-test-modal="webhook-form"]')).to.exist;
-//             expect(find('[data-test-modal="webhook-form"] [data-test-text="title"]').textContent)
-//                 .to.have.string('New webhook');
-
-//             // can cancel new webhook
-//             await click('[data-test-button="cancel-webhook"]');
-//             expect(find('[data-test-modal="webhook-form"]')).to.not.exist;
-
-//             // create new webhook
-//             await click('[data-test-link="add-webhook"]');
-//             await fillIn('[data-test-input="webhook-name"]', 'First webhook');
-//             await fillIn('[data-test-select="webhook-event"]', 'site.changed');
-//             await fillIn('[data-test-input="webhook-targetUrl"]', 'https://example.com/first-webhook');
-//             await click('[data-test-button="save-webhook"]');
-
-//             // modal closed and 1 webhook listed with correct details
-//             expect(find('[data-test-modal="webhook-form"]')).to.not.exist;
-//             expect(find('[data-test-webhook-row]')).to.exist;
-//             let row = find('[data-test-webhook-row="1"]');
-//             expect(row.querySelector('[data-test-text="name"]').textContent)
-//                 .to.have.string('First webhook');
-//             expect(row.querySelector('[data-test-text="event"]').textContent)
-//                 .to.have.string('Site changed (rebuild)');
-//             expect(row.querySelector('[data-test-text="targetUrl"]').textContent)
-//                 .to.have.string('https://example.com/first-webhook');
-//             expect(row.querySelector('[data-test-text="last-triggered"]').textContent)
-//                 .to.have.string('Not triggered');
-
-//             // click edit webhook link
-//             await click('[data-test-webhook-row="1"] [data-test-newsletter-menu-trigger]');
-//             await click('[data-test-link="edit-webhook"]');
-
-//             // modal appears and has correct title
-//             expect(find('[data-test-modal="webhook-form"]')).to.exist;
-//             expect(find('[data-test-modal="webhook-form"] [data-test-text="title"]').textContent)
-//                 .to.have.string('Edit webhook');
-//         });
-
-//         // test to ensure the `value=description` passed to `gh-text-input` is `readonly`
-//         it('doesn\'t show unsaved changes modal after placing focus on description field', async function () {
-//             this.server.create('integration');
-
-//             await visit('/settings/integrations/1');
-//             await click('[data-test-input="description"]');
-//             await blur('[data-test-input="description"]');
-//             await click('[data-test-link="integrations-back"]');
-
-//             expect(
-//                 find('[data-test-modal="unsaved-settings"]'),
-//                 'unsaved changes modal is not shown'
-//             ).to.not.exist;
-
-//             expect(currentURL()).to.equal('/settings/integrations');
-//         });
-
-//         it('can delete integration', async function () {
-//             this.server.create('integration');
-
-//             await visit('/settings/integrations/1');
-//             await click('[data-test-button="delete-integration"]');
-
-//             expect(find('[data-test-modal="delete-integration"]')).to.exist;
-
-//             await click('[data-test-modal="delete-integration"] [data-test-button="confirm"]');
-
-//             expect(find('[data-test-modal="delete-integration"]')).to.not.exist;
-//             expect(currentURL()).to.equal('/settings/integrations');
-//             expect(find('[data-test-custom-integration]')).to.not.exist;
-//         });
-//     });
-// });
diff --git a/ghost/admin/tests/acceptance/settings/labs-test.js b/ghost/admin/tests/acceptance/settings/labs-test.js
deleted file mode 100644
index e4ebd314c48..00000000000
--- a/ghost/admin/tests/acceptance/settings/labs-test.js
+++ /dev/null
@@ -1,338 +0,0 @@
-// import {authenticateSession, invalidateSession} from 'ember-simple-auth/test-support';
-// import {beforeEach, describe, it} from 'mocha';
-// import {click, currentURL, fillIn, find, findAll} from '@ember/test-helpers';
-// import {expect} from 'chai';
-// import {fileUpload} from '../../helpers/file-upload';
-// import {setupApplicationTest} from 'ember-mocha';
-// import {setupMirage} from 'ember-cli-mirage/test-support';
-// import {visit} from '../../helpers/visit';
-
-// describe('Acceptance: Settings - Labs', function () {
-//     let hooks = setupApplicationTest();
-//     setupMirage(hooks);
-
-//     it('redirects to signin when not authenticated', async function () {
-//         await invalidateSession();
-//         await visit('/settings/labs');
-
-//         expect(currentURL(), 'currentURL').to.equal('/signin');
-//     });
-
-//     it('redirects to home page when authenticated as contributor', async function () {
-//         let role = this.server.create('role', {name: 'Contributor'});
-//         this.server.create('user', {roles: [role], slug: 'test-user'});
-
-//         await authenticateSession();
-//         await visit('/settings/labs');
-
-//         expect(currentURL(), 'currentURL').to.equal('/posts');
-//     });
-
-//     it('redirects to home page when authenticated as author', async function () {
-//         let role = this.server.create('role', {name: 'Author'});
-//         this.server.create('user', {roles: [role], slug: 'test-user'});
-
-//         await authenticateSession();
-//         await visit('/settings/labs');
-
-//         expect(currentURL(), 'currentURL').to.equal('/site');
-//     });
-
-//     it('redirects to home page when authenticated as editor', async function () {
-//         let role = this.server.create('role', {name: 'Editor'});
-//         this.server.create('user', {roles: [role], slug: 'test-user'});
-
-//         await authenticateSession();
-//         await visit('/settings/labs');
-
-//         expect(currentURL(), 'currentURL').to.equal('/site');
-//     });
-
-//     describe('when logged in', function () {
-//         beforeEach(async function () {
-//             let role = this.server.create('role', {name: 'Administrator'});
-//             this.server.create('user', {roles: [role]});
-
-//             return await authenticateSession();
-//         });
-
-//         it('it renders', async function () {
-//             await visit('/settings/labs');
-
-//             // has correct url
-//             expect(currentURL(), 'currentURL').to.equal('/settings/labs');
-
-//             // has correct page title
-//             expect(document.title, 'page title').to.equal('Settings - Labs - Test Blog');
-
-//             // highlights nav menu
-//             expect(find('[data-test-nav="settings"]'), 'highlights nav menu item')
-//                 .to.have.class('active');
-//         });
-
-//         it('can delete all content', async function () {
-//             await visit('/settings/labs');
-//             await click('[data-test-button="delete-all"]');
-
-//             const modal = '[data-test-modal="confirm-delete-all"]';
-//             expect(find(modal)).to.exist;
-
-//             await click(`${modal} [data-test-button="confirm"]`);
-
-//             // API request is correct
-//             const [lastRequest] = this.server.pretender.handledRequests.slice(-1);
-//             expect(lastRequest.url).to.equal('/ghost/api/admin/db/');
-//             expect(lastRequest.method).to.equal('DELETE');
-
-//             expect(find(modal)).to.not.exist;
-//         });
-
-//         it('can upload/download redirects', async function () {
-//             await visit('/settings/labs');
-
-//             // successful upload
-//             this.server.post('/redirects/upload/', {}, 200);
-
-//             await fileUpload(
-//                 '[data-test-file-input="redirects"] input',
-//                 ['test'],
-//                 {name: 'redirects.json', type: 'application/json'}
-//             );
-
-//             // TODO: tests for the temporary success/failure state have been
-//             // disabled because they were randomly failing
-
-//             // this should be half-way through button reset timeout
-//             // await timeout(50);
-//             //
-//             // // shows success button
-//             // let buttons = findAll('[data-test-button="upload-redirects"]');
-//             // expect(buttons.length, 'no of success buttons').to.equal(1);
-//             // expect(
-//             //     buttons[0],
-//             //     'success button is green'
-//             // ).to.have.class('gh-btn-green);
-//             // expect(
-//             //     button.textContent,
-//             //     'success button text'
-//             // ).to.have.string('Uploaded');
-//             //
-//             // await wait();
-
-//             // returned to normal button
-//             let buttons = findAll('[data-test-button="upload-redirects"]');
-//             expect(buttons.length, 'no of post-success buttons').to.equal(1);
-//             expect(
-//                 buttons[0],
-//                 'post-success button doesn\'t have success class'
-//             ).to.not.have.class('gh-btn-green');
-//             expect(
-//                 buttons[0].textContent,
-//                 'post-success button text'
-//             ).to.have.string('Upload redirects');
-
-//             // failed upload
-//             this.server.post('/redirects/upload/', {
-//                 errors: [{
-//                     type: 'BadRequestError',
-//                     message: 'Test failure message'
-//                 }]
-//             }, 400);
-
-//             await fileUpload(
-//                 '[data-test-file-input="redirects"] input',
-//                 ['test'],
-//                 {name: 'redirects-bad.json', type: 'application/json'}
-//             );
-
-//             // TODO: tests for the temporary success/failure state have been
-//             // disabled because they were randomly failing
-
-//             // this should be half-way through button reset timeout
-//             // await timeout(50);
-//             //
-//             // shows failure button
-//             // buttons = findAll('[data-test-button="upload-redirects"]');
-//             // expect(buttons.length, 'no of failure buttons').to.equal(1);
-//             // expect(
-//             //     buttons[0],
-//             //     'failure button is red'
-//             // ).to.have.class('gh-btn-red);
-//             // expect(
-//             //     buttons[0].textContent,
-//             //     'failure button text'
-//             // ).to.have.string('Upload Failed');
-//             //
-//             // await wait();
-
-//             // shows error message
-//             expect(
-//                 find('[data-test-error="redirects"]').textContent.trim(),
-//                 'upload error text'
-//             ).to.have.string('Test failure message');
-
-//             // returned to normal button
-//             buttons = findAll('[data-test-button="upload-redirects"]');
-//             expect(buttons.length, 'no of post-failure buttons').to.equal(1);
-//             expect(
-//                 buttons[0],
-//                 'post-failure button doesn\'t have failure class'
-//             ).to.not.have.class('gh-btn-red');
-//             expect(
-//                 buttons[0].textContent,
-//                 'post-failure button text'
-//             ).to.have.string('Upload redirects');
-
-//             // successful upload clears error
-//             this.server.post('/redirects/upload/', {}, 200);
-//             await fileUpload(
-//                 '[data-test-file-input="redirects"] input',
-//                 ['test'],
-//                 {name: 'redirects-bad.json', type: 'application/json'}
-//             );
-
-//             expect(find('[data-test-error="redirects"]')).to.not.exist;
-
-//             // can download redirects.json
-//             await click('[data-test-link="download-redirects"]');
-
-//             let iframe = document.querySelector('#iframeDownload');
-//             expect(iframe.getAttribute('src')).to.have.string('/redirects/download/');
-//         });
-
-//         it('can upload/download routes.yaml', async function () {
-//             await visit('/settings/labs');
-
-//             // successful upload
-//             this.server.post('/settings/routes/yaml/', {}, 200);
-
-//             await fileUpload(
-//                 '[data-test-file-input="routes"] input',
-//                 ['test'],
-//                 {name: 'routes.yaml', type: 'application/x-yaml'}
-//             );
-
-//             // TODO: tests for the temporary success/failure state have been
-//             // disabled because they were randomly failing
-
-//             // this should be half-way through button reset timeout
-//             // await timeout(50);
-//             //
-//             // // shows success button
-//             // let button = find('[data-test-button="upload-routes"]');
-//             // expect(button.length, 'no of success buttons').to.equal(1);
-//             // expect(
-//             //     button.hasClass('gh-btn-green'),
-//             //     'success button is green'
-//             // ).to.be.true;
-//             // expect(
-//             //     button.text().trim(),
-//             //     'success button text'
-//             // ).to.have.string('Uploaded');
-//             //
-//             // await wait();
-
-//             // returned to normal button
-//             let buttons = findAll('[data-test-button="upload-routes"]');
-//             expect(buttons.length, 'no of post-success buttons').to.equal(1);
-//             expect(
-//                 buttons[0],
-//                 'routes post-success button doesn\'t have success class'
-//             ).to.not.have.class('gh-btn-green');
-//             expect(
-//                 buttons[0].textContent,
-//                 'routes post-success button text'
-//             ).to.have.string('Upload routes YAML');
-
-//             // failed upload
-//             this.server.post('/settings/routes/yaml/', {
-//                 errors: [{
-//                     type: 'BadRequestError',
-//                     message: 'Test failure message'
-//                 }]
-//             }, 400);
-
-//             await fileUpload(
-//                 '[data-test-file-input="routes"] input',
-//                 ['test'],
-//                 {name: 'routes-bad.yaml', type: 'application/x-yaml'}
-//             );
-
-//             // TODO: tests for the temporary success/failure state have been
-//             // disabled because they were randomly failing
-
-//             // this should be half-way through button reset timeout
-//             // await timeout(50);
-//             //
-//             // shows failure button
-//             // button = find('[data-test-button="upload-routes"]');
-//             // expect(button.length, 'no of failure buttons').to.equal(1);
-//             // expect(
-//             //     button.hasClass('gh-btn-red'),
-//             //     'failure button is red'
-//             // ).to.be.true;
-//             // expect(
-//             //     button.text().trim(),
-//             //     'failure button text'
-//             // ).to.have.string('Upload Failed');
-//             //
-//             // await wait();
-
-//             // shows error message
-//             expect(
-//                 find('[data-test-error="routes"]').textContent,
-//                 'routes upload error text'
-//             ).to.have.string('Test failure message');
-
-//             // returned to normal button
-//             buttons = findAll('[data-test-button="upload-routes"]');
-//             expect(buttons.length, 'no of post-failure buttons').to.equal(1);
-//             expect(
-//                 buttons[0],
-//                 'routes post-failure button doesn\'t have failure class'
-//             ).to.not.have.class('gh-btn-red');
-//             expect(
-//                 buttons[0].textContent,
-//                 'routes post-failure button text'
-//             ).to.have.string('Upload routes YAML');
-
-//             // successful upload clears error
-//             this.server.post('/settings/routes/yaml/', {}, 200);
-//             await fileUpload(
-//                 '[data-test-file-input="routes"] input',
-//                 ['test'],
-//                 {name: 'routes-good.yaml', type: 'application/x-yaml'}
-//             );
-
-//             expect(find('[data-test-error="routes"]')).to.not.exist;
-
-//             // can download redirects.json
-//             await click('[data-test-link="download-routes"]');
-
-//             let iframe = document.querySelector('#iframeDownload');
-//             expect(iframe.getAttribute('src')).to.have.string('/settings/routes/yaml/');
-//         });
-
-//     describe('When logged in as Owner', function () {
-//         beforeEach(async function () {
-//             let role = this.server.create('role', {name: 'Owner'});
-//             this.server.create('user', {roles: [role]});
-
-//             return await authenticateSession();
-//         });
-
-//         it.skip('sets the mailgunBaseUrl to the default', async function () {
-//             await visit('/settings/members');
-
-//             await fillIn('[data-test-mailgun-api-key-input]', 'i_am_an_api_key');
-//             await fillIn('[data-test-mailgun-domain-input]', 'https://domain.tld');
-
-//             await click('[data-test-button="save-members-settings"]');
-
-//             let [lastRequest] = this.server.pretender.handledRequests.slice(-1);
-//             let params = JSON.parse(lastRequest.requestBody);
-
-//             expect(params.settings.findBy('key', 'mailgun_base_url').value).not.to.equal(null);
-//         });
-//     });
-// });
diff --git a/ghost/admin/tests/acceptance/settings/membership-test.js b/ghost/admin/tests/acceptance/settings/membership-test.js
deleted file mode 100644
index 1291e171bec..00000000000
--- a/ghost/admin/tests/acceptance/settings/membership-test.js
+++ /dev/null
@@ -1,292 +0,0 @@
-// import {authenticateSession, invalidateSession} from 'ember-simple-auth/test-support';
-// import {blur, click, currentURL, fillIn, find, findAll} from '@ember/test-helpers';
-// import {expect} from 'chai';
-// import {setupApplicationTest} from 'ember-mocha';
-// import {setupMirage} from 'ember-cli-mirage/test-support';
-// import {visit} from '../../helpers/visit';
-
-// describe('Acceptance: Settings - Membership', function () {
-//     const hooks = setupApplicationTest();
-//     setupMirage(hooks);
-
-//     beforeEach(function () {
-//     });
-
-//     beforeEach(async function () {
-//         this.server.loadFixtures('configs');
-//         this.server.loadFixtures('tiers');
-
-//         this.server.db.configs.update(1, {blogUrl: 'http://localhost:2368'});
-
-//         const role = this.server.create('role', {name: 'Owner'});
-//         this.server.create('user', {roles: [role]});
-
-//         return await authenticateSession();
-//     });
-
-//     describe('permissions', function () {
-//         let visitAs;
-
-//         before(function () {
-//             visitAs = async (roleName) => {
-//                 const role = this.server.create('role', {name: roleName});
-//                 this.server.create('user', {roles: [role]});
-//                 await authenticateSession();
-//                 await visit('/settings/members');
-//             };
-//         });
-
-//         beforeEach(async function () {
-//             this.server.db.users.remove();
-//             await invalidateSession();
-//         });
-
-//         it('allows Owners', async function () {
-//             await visitAs('Owner');
-//             expect(currentURL()).to.equal('/settings/members');
-//         });
-
-//         it('allows Administrators', async function () {
-//             await visitAs('Administrator');
-//             expect(currentURL()).to.equal('/settings/members');
-//         });
-
-//         it('disallows Editors', async function () {
-//             await visitAs('Editor');
-//             expect(currentURL()).to.not.equal('/settings/members');
-//         });
-
-//         it('disallows Authors', async function () {
-//             await visitAs('Author');
-//             expect(currentURL()).to.not.equal('/settings/members');
-//         });
-
-//         it('disallows Contributors', async function () {
-//             await visitAs('Contributor');
-//             expect(currentURL()).to.not.equal('/settings/members');
-//         });
-//     });
-
-//     it('can change subscription access', async function () {
-//         await visit('/settings/members');
-
-//         expect(this.server.db.settings.findBy({key: 'members_signup_access'}).value).to.equal('all');
-//         expect(find('[data-test-members-subscription-option="all"]'), 'initial selection is "all"').to.exist;
-//         expect(find('[data-test-iframe="portal-preview"]'), 'initial preview src matches "all"')
-//             .to.have.attribute('src').match(/membersSignupAccess=all/);
-
-//         // open dropdown
-//         await click('[data-test-members-subscription-option="all"]');
-
-//         // all settings exist in dropdown
-//         expect(find('.ember-power-select-options [data-test-members-subscription-option="all"]'), 'all option').to.exist;
-//         expect(find('.ember-power-select-options [data-test-members-subscription-option="invite"]'), 'invite option').to.exist;
-//         expect(find('.ember-power-select-options [data-test-members-subscription-option="none"]'), 'none option').to.exist;
-
-//         // switch to invite
-//         await click('.ember-power-select-options [data-test-members-subscription-option="invite"]');
-
-//         expect(find('.ember-power-select-options'), 'dropdown closes').to.not.exist;
-//         expect(find('[data-test-members-subscription-option="invite"]'), 'invite option shown after selected').to.exist;
-//         expect(find('[data-test-iframe="portal-preview"]'))
-//             .to.have.attribute('src').match(/membersSignupAccess=invite/);
-
-//         await click('[data-test-button="save-settings"]');
-
-//         expect(this.server.db.settings.findBy({key: 'members_signup_access'}).value).to.equal('invite');
-
-//         // switch to nobody
-//         await click('[data-test-members-subscription-option="invite"]');
-//         await click('.ember-power-select-options [data-test-members-subscription-option="none"]');
-
-//         expect(find('.ember-power-select-options'), 'dropdown closes').to.not.exist;
-//         expect(find('[data-test-members-subscription-option="none"]'), 'none option shown after selected').to.exist;
-//         expect(find('[data-test-iframe="portal-preview"]')).to.not.exist;
-//         expect(find('[data-test-portal-preview-disabled]')).to.exist;
-
-//         expect(find('[data-test-default-post-access] .ember-basic-dropdown-trigger')).to.have.attribute('aria-disabled', 'true');
-
-//         await click('[data-test-button="save-settings"]');
-
-//         expect(this.server.db.settings.findBy({key: 'members_signup_access'}).value).to.equal('none');
-
-//         // automatically saves when switching back off nobody
-//         await click('[data-test-members-subscription-option="none"]');
-//         await click('.ember-power-select-options [data-test-members-subscription-option="invite"]');
-//         expect(this.server.db.settings.findBy({key: 'members_signup_access'}).value).to.equal('invite');
-//     });
-
-//     it('can change default post access', async function () {
-//         await visit('/settings/members');
-
-//         // fixtures match what we expect
-//         expect(this.server.db.settings.findBy({key: 'default_content_visibility'}).value).to.equal('public');
-//         expect(this.server.db.settings.findBy({key: 'default_content_visibility_tiers'}).value).to.equal('[]');
-
-//         expect(find('[data-test-default-post-access-option="public"]'), 'initial selection is "public"').to.exist;
-//         expect(find('[data-test-default-post-access-tiers]')).to.not.exist;
-
-//         // open dropdown
-//         await click('[data-test-default-post-access-option="public"]');
-
-//         // all settings exist in dropdown
-//         expect(find('.ember-power-select-options [data-test-default-post-access-option="public"]'), 'public option').to.exist;
-//         expect(find('.ember-power-select-options [data-test-default-post-access-option="members"]'), 'members-only option').to.exist;
-//         expect(find('.ember-power-select-options [data-test-default-post-access-option="paid"]'), 'paid-only option').to.exist;
-//         expect(find('.ember-power-select-options [data-test-default-post-access-option="tiers"]'), 'specific tiers option').to.exist;
-
-//         // switch to members only
-//         await click('.ember-power-select-options [data-test-default-post-access-option="members"]');
-//         await click('[data-test-button="save-settings"]');
-
-//         expect(this.server.db.settings.findBy({key: 'default_content_visibility'}).value).to.equal('members');
-//         expect(this.server.db.settings.findBy({key: 'default_content_visibility_tiers'}).value).to.equal('[]');
-
-//         expect(find('[data-test-default-post-access-option="members"]'), 'post-members selection is "members"').to.exist;
-//         expect(find('[data-test-default-post-access-tiers]')).to.not.exist;
-
-//         // can switch to specific tiers
-//         await click('[data-test-default-post-access-option="members"]');
-//         await click('.ember-power-select-options [data-test-default-post-access-option="tiers"]');
-
-//         // tiers input is shown
-//         expect(find('[data-test-default-post-access-tiers]')).to.exist;
-
-//         // open tiers dropdown
-//         await click('[data-test-default-post-access-tiers] .ember-basic-dropdown-trigger');
-
-//         // paid tiers are available in tiers input
-//         expect(find('[data-test-default-post-access-tiers] [data-test-visibility-segment-option="Default Tier"]')).to.exist;
-
-//         // select tier
-//         await click('[data-test-default-post-access-tiers] [data-test-visibility-segment-option="Default Tier"]');
-
-//         // save
-//         await click('[data-test-button="save-settings"]');
-//         expect(this.server.db.settings.findBy({key: 'default_content_visibility'}).value).to.equal('tiers');
-//         expect(this.server.db.settings.findBy({key: 'default_content_visibility_tiers'}).value).to.equal('["2"]');
-
-//         // switch back to non-tiers option
-//         await click('[data-test-default-post-access-option="tiers"]');
-//         await click('.ember-power-select-options [data-test-default-post-access-option="paid"]');
-
-//         expect(find('[data-test-default-post-access-tiers]')).to.not.exist;
-
-//         await click('[data-test-button="save-settings"]');
-//         expect(this.server.db.settings.findBy({key: 'default_content_visibility'}).value).to.equal('paid');
-//         expect(this.server.db.settings.findBy({key: 'default_content_visibility_tiers'}).value).to.equal('["2"]');
-//     });
-
-//     it('can manage free tier', async function () {
-//         await visit('/settings/members');
-//         await click('[data-test-button="toggle-free-settings"]');
-//         expect(find('[data-test-free-settings-expanded]'), 'expanded free settings').to.exist;
-
-//         // we aren't viewing the non-labs-flag input
-//         expect(find('[data-test-input="old-free-welcome-page"]')).to.not.exist;
-
-//         // it can set free signup welcome page
-
-//         // initial value
-//         expect(find('[data-test-input="free-welcome-page"]')).to.exist;
-//         expect(find('[data-test-input="free-welcome-page"]')).to.have.value('');
-
-//         // saving
-//         await fillIn('[data-test-input="free-welcome-page"]', 'not a url');
-//         await blur('[data-test-input="free-welcome-page"]');
-//         await click('[data-test-button="save-settings"]');
-
-//         expect(this.server.db.tiers.findBy({slug: 'free'}).welcomePageUrl)
-//             .to.equal('/not%20a%20url');
-
-//         // re-rendering will insert full URL in welcome page input
-//         await visit('/settings');
-//         await visit('/settings/members');
-
-//         expect(find('[data-test-input="free-welcome-page"]')).to.exist;
-//         expect(find('[data-test-input="free-welcome-page"]'))
-//             .to.have.value('http://localhost:2368/not%20a%20url');
-
-//         // it can manage free tier description and benefits
-
-//         // initial free tier details are as expected
-//         expect(find('[data-test-tier-card="free"]')).to.exist;
-//         expect(find('[data-test-tier-card="free"] [data-test-name]')).to.contain.text('Free');
-//         expect(find('[data-test-tier-card="free"] [data-test-description]')).to.contain.text('No description');
-//         expect(find('[data-test-tier-card="free"] [data-test-benefits]')).to.contain.text('No benefits');
-//         expect(find('[data-test-tier-card="free"] [data-test-free-price]')).to.exist;
-
-//         // open modal
-//         await click('[data-test-tier-card="free"] [data-test-button="edit-tier"]');
-
-//         // initial modal state is as expected
-//         const modal = '[data-test-modal="edit-tier"]';
-//         expect(find(modal)).to.exist;
-//         expect(find(`${modal} [data-test-input="tier-name"]`)).to.not.exist;
-//         expect(find(`${modal} [data-test-input="tier-description"]`)).to.not.exist;
-//         expect(find(`${modal} [data-test-input="free-tier-description"]`)).to.exist;
-//         expect(find(`${modal} [data-test-input="free-tier-description"]`)).to.have.value('');
-//         expect(find(`${modal} [data-test-formgroup="prices"]`)).to.not.exist;
-//         expect(find(`${modal} [data-test-benefit-item="new"]`)).to.exist;
-//         expect(findAll(`${modal} [data-test-benefit-item]`).length).to.equal(1);
-
-//         expect(find(`${modal} [data-test-tierpreview-title]`)).to.contain.text('Free Membership Preview');
-//         expect(find(`${modal} [data-test-tierpreview-description]`)).to.contain.text('Free preview of');
-//         expect(find(`${modal} [data-test-tierpreview-benefits]`)).to.contain.text('Access to all public posts');
-//         expect(find(`${modal} [data-test-tierpreview-price]`).textContent).to.match(/\$\s+0/);
-
-//         // can change description
-//         await fillIn(`${modal} [data-test-input="free-tier-description"]`, 'Test description');
-//         expect(find(`${modal} [data-test-tierpreview-description]`)).to.contain.text('Test description');
-
-//         // can manage benefits
-//         const newBenefit = `${modal} [data-test-benefit-item="new"]`;
-//         await fillIn(`${newBenefit} [data-test-input="benefit-label"]`, 'First benefit');
-//         await click(`${newBenefit} [data-test-button="add-benefit"]`);
-
-//         expect(find(`${modal} [data-test-tierpreview-benefits]`)).to.contain.text('First benefit');
-
-//         expect(find(`${modal} [data-test-benefit-item="0"]`)).to.exist;
-//         expect(find(`${modal} [data-test-benefit-item="new"]`)).to.exist;
-
-//         await click(`${newBenefit} [data-test-button="add-benefit"]`);
-//         expect(find(`${newBenefit}`)).to.contain.text('Please enter a benefit');
-
-//         await fillIn(`${newBenefit} [data-test-input="benefit-label"]`, 'Second benefit');
-//         await click(`${newBenefit} [data-test-button="add-benefit"]`);
-
-//         expect(find(`${modal} [data-test-tierpreview-benefits]`)).to.contain.text('Second benefit');
-//         expect(findAll(`${modal} [data-test-tierpreview-benefits] div`).length).to.equal(4);
-
-//         await click(`${modal} [data-test-benefit-item="0"] [data-test-button="delete-benefit"]`);
-
-//         expect(find(`${modal} [data-test-tierpreview-benefits]`)).to.not.contain.text('First benefit');
-//         expect(findAll(`${modal} [data-test-tierpreview-benefits] div`).length).to.equal(2);
-
-//         // Add a new benefit that we will later rename to an empty name
-//         await fillIn(`${newBenefit} [data-test-input="benefit-label"]`, 'Third benefit');
-//         await click(`${newBenefit} [data-test-button="add-benefit"]`);
-
-//         expect(find(`${modal} [data-test-tierpreview-benefits]`)).to.contain.text('Third benefit');
-//         expect(findAll(`${modal} [data-test-tierpreview-benefits] div`).length).to.equal(4);
-
-//         // Clear the second benefit's name (it should get removed after saving)
-//         const secondBenefitItem = `${modal} [data-test-benefit-item="1"]`;
-//         await fillIn(`${secondBenefitItem} [data-test-input="benefit-label"]`, '');
-
-//         await click('[data-test-button="save-tier"]');
-
-//         expect(find(`${modal}`)).to.not.exist;
-//         expect(find('[data-test-tier-card="free"] [data-test-name]')).to.contain.text('Free');
-//         expect(find('[data-test-tier-card="free"] [data-test-description]')).to.contain.text('Test description');
-//         expect(find('[data-test-tier-card="free"] [data-test-benefits]')).to.contain.text('Benefits (1)');
-//         expect(find('[data-test-tier-card="free"] [data-test-benefits] li:nth-of-type(1)')).to.contain.text('Second benefit');
-//         expect(findAll(`[data-test-tier-card="free"] [data-test-benefits] li`).length).to.equal(1);
-
-//         const freeTier = this.server.db.tiers.findBy({slug: 'free'});
-//         expect(freeTier.description).to.equal('Test description');
-//         expect(freeTier.welcomePageUrl).to.equal('/not%20a%20url');
-//         expect(freeTier.benefits.length).to.equal(1);
-//         expect(freeTier.benefits[0]).to.equal('Second benefit');
-//     });
-// });
diff --git a/ghost/admin/tests/acceptance/settings/navigation-test.js b/ghost/admin/tests/acceptance/settings/navigation-test.js
deleted file mode 100644
index 69c0099e946..00000000000
--- a/ghost/admin/tests/acceptance/settings/navigation-test.js
+++ /dev/null
@@ -1,252 +0,0 @@
-// import ctrlOrCmd from 'ghost-admin/utils/ctrl-or-cmd';
-// import {authenticateSession} from 'ember-simple-auth/test-support';
-// import {beforeEach, describe, it} from 'mocha';
-// import {blur, click, currentRouteName, currentURL, fillIn, find, findAll, triggerEvent, typeIn} from '@ember/test-helpers';
-// import {expect} from 'chai';
-// import {setupApplicationTest} from 'ember-mocha';
-// import {setupMirage} from 'ember-cli-mirage/test-support';
-// import {visit} from '../../helpers/visit';
-
-// // simulate jQuery's `:visible` pseudo-selector
-// function withText(elements) {
-//     return Array.from(elements).filter(elem => elem.textContent.trim() !== '');
-// }
-
-// describe('Acceptance: Settings - Navigation', function () {
-//     let hooks = setupApplicationTest();
-//     setupMirage(hooks);
-
-//     describe('when logged in', function () {
-//         beforeEach(async function () {
-//             let role = this.server.create('role', {name: 'Administrator'});
-//             this.server.create('user', {roles: [role]});
-
-//             await authenticateSession();
-//         });
-
-//         it('can visit /settings/navigation', async function () {
-//             await visit('/settings/navigation');
-
-//             expect(currentRouteName()).to.equal('settings.navigation');
-//             expect(find('[data-test-save-button]').textContent.trim(), 'save button text').to.equal('Save');
-
-//             // fixtures contain two nav items, check for four rows as we
-//             // should have one extra that's blank for each navigation section
-//             expect(
-//                 findAll('[data-test-navitem]').length,
-//                 'navigation items count'
-//             ).to.equal(4);
-//         });
-
-//         it('saves navigation settings', async function () {
-//             await visit('/settings/navigation');
-//             await fillIn('#settings-navigation [data-test-navitem="0"] [data-test-input="label"]', 'Test');
-//             await typeIn('#settings-navigation [data-test-navitem="0"] [data-test-input="url"]', '/test');
-//             await click('[data-test-save-button]');
-
-//             let [navSetting] = this.server.db.settings.where({key: 'navigation'});
-
-//             expect(navSetting.value).to.equal('[{"label":"Test","url":"/test/"},{"label":"About","url":"/about"}]');
-
-//             // don't test against .error directly as it will pick up failed
-//             // tests "pre.error" elements
-//             expect(findAll('span.error').length, 'error messages count').to.equal(0);
-//             expect(findAll('.gh-alert').length, 'alerts count').to.equal(0);
-//             expect(withText(findAll('[data-test-error]')).length, 'validation errors count')
-//                 .to.equal(0);
-//         });
-
-//         it('validates new item correctly on save', async function () {
-//             await visit('/settings/navigation');
-//             await click('[data-test-save-button]');
-
-//             expect(
-//                 findAll('#settings-navigation [data-test-navitem]').length,
-//                 'number of nav items after saving with blank new item'
-//             ).to.equal(3);
-
-//             await fillIn('#settings-navigation [data-test-navitem="new"] [data-test-input="label"]', 'Test');
-//             await fillIn('#settings-navigation [data-test-navitem="new"] [data-test-input="url"]', '');
-//             await typeIn('#settings-navigation [data-test-navitem="new"] [data-test-input="url"]', 'http://invalid domain/');
-
-//             await click('[data-test-save-button]');
-
-//             expect(
-//                 findAll('#settings-navigation [data-test-navitem]').length,
-//                 'number of nav items after saving with invalid new item'
-//             ).to.equal(3);
-
-//             expect(
-//                 withText(findAll('#settings-navigation [data-test-navitem="new"] [data-test-error]')).length,
-//                 'number of invalid fields in new item'
-//             ).to.equal(1);
-//         });
-
-//         it('clears unsaved settings when navigating away but warns with a confirmation dialog', async function () {
-//             await visit('/settings/navigation');
-//             await fillIn('[data-test-navitem="0"] [data-test-input="label"]', 'Test');
-//             await blur('[data-test-navitem="0"] [data-test-input="label"]');
-
-//             expect(find('[data-test-navitem="0"] [data-test-input="label"]').value).to.equal('Test');
-
-//             await visit('/settings/code-injection');
-
-//             expect(findAll('[data-test-modal="unsaved-settings"]').length, 'modal exists').to.equal(1);
-
-//             // Leave without saving
-//             await click('[data-test-leave-button]'), 'leave without saving';
-
-//             expect(currentURL(), 'currentURL').to.equal('/settings/code-injection');
-
-//             await visit('/settings/navigation');
-
-//             expect(find('[data-test-navitem="0"] [data-test-input="label"]').value).to.equal('Home');
-//         });
-
-//         it('can add and remove items', async function () {
-//             await visit('/settings/navigation');
-//             await click('#settings-navigation .gh-blognav-add');
-
-//             expect(
-//                 find('[data-test-navitem="new"] [data-test-error="label"]').textContent.trim(),
-//                 'blank label has validation error'
-//             ).to.not.be.empty;
-
-//             await fillIn('[data-test-navitem="new"] [data-test-input="label"]', '');
-//             await typeIn('[data-test-navitem="new"] [data-test-input="label"]', 'New');
-
-//             expect(
-//                 find('[data-test-navitem="new"] [data-test-error="label"]').textContent.trim(),
-//                 'label validation is visible after typing'
-//             ).to.be.empty;
-
-//             await fillIn('[data-test-navitem="new"] [data-test-input="url"]', '');
-//             await typeIn('[data-test-navitem="new"] [data-test-input="url"]', '/new');
-//             await blur('[data-test-navitem="new"] [data-test-input="url"]');
-
-//             expect(
-//                 find('[data-test-navitem="new"] [data-test-error="url"]').textContent.trim(),
-//                 'url validation is visible after typing'
-//             ).to.be.empty;
-
-//             expect(
-//                 find('[data-test-navitem="new"] [data-test-input="url"]').value
-//             ).to.equal(`${window.location.origin}/new/`);
-
-//             await click('.gh-blognav-add');
-
-//             expect(
-//                 findAll('#settings-navigation [data-test-navitem]').length,
-//                 'number of nav items after successful add'
-//             ).to.equal(4);
-
-//             expect(
-//                 find('#settings-navigation [data-test-navitem="new"] [data-test-input="label"]').value,
-//                 'new item label value after successful add'
-//             ).to.be.empty;
-
-//             expect(
-//                 find('#settings-navigation [data-test-navitem="new"] [data-test-input="url"]').value,
-//                 'new item url value after successful add'
-//             ).to.equal(`${window.location.origin}/`);
-
-//             expect(
-//                 withText(findAll('[data-test-navitem] [data-test-error]')).length,
-//                 'number or validation errors shown after successful add'
-//             ).to.equal(0);
-
-//             await click('#settings-navigation [data-test-navitem="0"] .gh-blognav-delete');
-
-//             expect(
-//                 findAll('#settings-navigation [data-test-navitem]').length,
-//                 'number of nav items after successful remove'
-//             ).to.equal(3);
-
-//             // CMD-S shortcut works
-//             await triggerEvent('.gh-app', 'keydown', {
-//                 keyCode: 83, // s
-//                 metaKey: ctrlOrCmd === 'command',
-//                 ctrlKey: ctrlOrCmd === 'ctrl'
-//             });
-
-//             let [navSetting] = this.server.db.settings.where({key: 'navigation'});
-
-//             expect(navSetting.value).to.equal('[{"label":"About","url":"/about"},{"label":"New","url":"/new/"}]');
-//         });
-
-//         it('can also add and remove items from seconday nav', async function () {
-//             await visit('/settings/navigation');
-//             await click('#secondary-navigation .gh-blognav-add');
-
-//             expect(
-//                 find('#secondary-navigation [data-test-navitem="new"] [data-test-error="label"]').textContent.trim(),
-//                 'blank label has validation error'
-//             ).to.not.be.empty;
-
-//             await fillIn('#secondary-navigation [data-test-navitem="new"] [data-test-input="label"]', '');
-//             await typeIn('#secondary-navigation [data-test-navitem="new"] [data-test-input="label"]', 'Foo');
-
-//             expect(
-//                 find('#secondary-navigation [data-test-navitem="new"] [data-test-error="label"]').textContent.trim(),
-//                 'label validation is visible after typing'
-//             ).to.be.empty;
-
-//             await fillIn('#secondary-navigation [data-test-navitem="new"] [data-test-input="url"]', '');
-//             await typeIn('#secondary-navigation [data-test-navitem="new"] [data-test-input="url"]', '/bar');
-//             await blur('#secondary-navigation [data-test-navitem="new"] [data-test-input="url"]');
-
-//             expect(
-//                 find('#secondary-navigation [data-test-navitem="new"] [data-test-error="url"]').textContent.trim(),
-//                 'url validation is visible after typing'
-//             ).to.be.empty;
-
-//             expect(
-//                 find('#secondary-navigation [data-test-navitem="new"] [data-test-input="url"]').value
-//             ).to.equal(`${window.location.origin}/bar/`);
-
-//             await click('[data-test-save-button]');
-
-//             expect(
-//                 findAll('#secondary-navigation [data-test-navitem]').length,
-//                 'number of nav items after successful add'
-//             ).to.equal(2);
-
-//             expect(
-//                 find('#secondary-navigation [data-test-navitem="new"] [data-test-input="label"]').value,
-//                 'new item label value after successful add'
-//             ).to.be.empty;
-
-//             expect(
-//                 find('#secondary-navigation [data-test-navitem="new"] [data-test-input="url"]').value,
-//                 'new item url value after successful add'
-//             ).to.equal(`${window.location.origin}/`);
-
-//             expect(
-//                 withText(findAll('#secondary-navigation [data-test-navitem] [data-test-error]')).length,
-//                 'number or validation errors shown after successful add'
-//             ).to.equal(0);
-
-//             let [navSetting] = this.server.db.settings.where({key: 'secondary_navigation'});
-
-//             expect(navSetting.value).to.equal('[{"label":"Foo","url":"/bar/"}]');
-
-//             await click('#secondary-navigation [data-test-navitem="0"] .gh-blognav-delete');
-
-//             expect(
-//                 findAll('#secondary-navigation [data-test-navitem]').length,
-//                 'number of nav items after successful remove'
-//             ).to.equal(1);
-
-//             // CMD-S shortcut works
-//             await triggerEvent('.gh-app', 'keydown', {
-//                 keyCode: 83, // s
-//                 metaKey: ctrlOrCmd === 'command',
-//                 ctrlKey: ctrlOrCmd === 'ctrl'
-//             });
-
-//             [navSetting] = this.server.db.settings.where({key: 'secondary_navigation'});
-
-//             expect(navSetting.value).to.equal('[]');
-//         });
-//     });
-// });
diff --git a/ghost/admin/tests/acceptance/settings/newsletters-test.js b/ghost/admin/tests/acceptance/settings/newsletters-test.js
deleted file mode 100644
index ae2c2ed8051..00000000000
--- a/ghost/admin/tests/acceptance/settings/newsletters-test.js
+++ /dev/null
@@ -1,574 +0,0 @@
-// import {authenticateSession} from 'ember-simple-auth/test-support';
-// import {click, currentURL, fillIn, find, findAll} from '@ember/test-helpers';
-// import {expect} from 'chai';
-// import {setupApplicationTest} from 'ember-mocha';
-// import {setupMirage} from 'ember-cli-mirage/test-support';
-// import {visit} from '../../helpers/visit';
-
-// async function checkValidationError(errors) {
-//     // Create the newsletter
-//     await click('[data-test-button="save-newsletter"]');
-
-//     // @todo: at the moment, the tabs don't open on error automatically
-//     // we need to remove these lines when this is fixed
-//     // and replace it with something like ± checkTabOpen('genexral')
-//     // await openTab('general.name');
-
-//     for (const selector of Object.keys(errors)) {
-//         expect(findAll(selector).length, 'field ' + selector + ' is not visible').to.equal(1);
-//         expect(findAll(selector + ' + .response').length, 'error message is displayed').to.equal(1);
-//         expect(find(selector + ' + .response').textContent).to.match(errors[selector]);
-//     }
-
-//     // Check button is in error state
-//     expect(find('[data-test-button="save-newsletter"] > [data-test-task-button-state="failure"]')).to.exist;
-// }
-
-// async function checkSave(options) {
-//     const name = options.edit ? 'edit' : 'create';
-
-//     // Create the newsletter
-//     await click('[data-test-button="save-newsletter"]');
-
-//     // No errors
-//     expect(findAll('.error > .response').length, 'error message is displayed').to.equal(0);
-
-//     if (options.verifyEmail) {
-//         expect(find('[data-test-modal="confirm-newsletter-email"]'), 'Confirm email modal').to.exist;
-
-//         // Check message
-//         if (typeof verifyEmail !== 'boolean') {
-//             const t = find('[data-test-modal="confirm-newsletter-email"] p').textContent.trim().replace(/\s+/g, ' ');
-//             expect(t).to.match(options.verifyEmail, t);
-//         }
-//         await click('[data-test-button="confirm-newsletter-email"]');
-//     }
-
-//     // Check if modal closes on save
-//     expect(find(`[data-test-modal="${name}-newsletter"]`), 'Newsletter modal should disappear after saving').to.not.exist;
-// }
-
-// async function checkCancel(options) {
-//     const name = options.edit ? 'edit' : 'create';
-
-//     // Create the newsletter
-//     await click('[data-test-button="cancel-newsletter"]');
-
-//     if (options.shouldConfirm) {
-//         expect(find('[data-test-modal="unsaved-settings"]'), 'Confirm unsaved settings modal should be visible').to.exist;
-//         await click('[data-test-leave-button]');
-//     }
-
-//     // Check if modal closes on save
-//     expect(find(`[data-test-modal="${name}-newsletter"]`), 'Newsletter modal should disappear after canceling').to.not.exist;
-// }
-
-// async function openTab(name, optional = true) {
-//     const generalToggleSelector = '[data-test-nav-toggle="' + name + '"]';
-//     const generalToggle = find(generalToggleSelector);
-//     const doesExist = !!generalToggle;
-
-//     if (!doesExist && !optional) {
-//         throw new Error('Expected tab ' + name + ' to exist');
-//     }
-
-//     if (doesExist && !generalToggle.classList.contains('active')) {
-//         await click(generalToggleSelector);
-
-//         if (!generalToggle.classList.contains('active')) {
-//             throw new Error('Could not open ' + name + ' tab');
-//         }
-//     }
-// }
-
-// async function closeTab(name, optional = true) {
-//     const generalToggleSelector = '[data-test-nav-toggle="' + name + '"]';
-//     const generalToggle = find(generalToggleSelector);
-//     const doesExist = !!generalToggle;
-
-//     if (!doesExist && !optional) {
-//         throw new Error('Expected tab ' + name + ' to exist');
-//     }
-
-//     if (doesExist && generalToggle.classList.contains('active')) {
-//         await click(generalToggleSelector);
-
-//         if (generalToggle.classList.contains('active')) {
-//             throw new Error('Could not close ' + name + ' tab');
-//         }
-//     }
-// }
-
-// async function fillName(name) {
-//     await openTab('general.name');
-//     await fillIn('input#newsletter-title', name);
-// }
-
-// describe('Acceptance: Settings - Newsletters', function () {
-//     const hooks = setupApplicationTest();
-//     setupMirage(hooks);
-
-//     beforeEach(async function () {
-//         this.server.loadFixtures('configs', 'newsletters');
-
-//         const role = this.server.create('role', {name: 'Owner'});
-//         this.server.create('user', {roles: [role]});
-
-//         return await authenticateSession();
-//     });
-
-//     it('redirects old path', async function () {
-//         await visit('/settings/members-email');
-//         expect(currentURL()).to.equal('/settings/newsletters');
-//     });
-
-//     describe('Creating newsletters', function () {
-//         it('can create new newsletter', async function () {
-//             await visit('/settings/newsletters');
-//             expect(findAll('[data-test-newsletter]').length, 'Total newsletters shown').to.equal(1);
-//             await click('[data-test-button="add-newsletter"]');
-
-//             // Check if modal opens
-//             expect(find('[data-test-modal="create-newsletter"]'), 'Create newsletter modal').to.exist;
-
-//             // Fill in the newsletter name
-//             await fillName('My new newsletter');
-
-//             // Fill in the newsletter description
-//             await fillIn('textarea#newsletter-description', 'My newsletter description');
-
-//             await checkSave({});
-
-//             expect(findAll('[data-test-newsletter]').length, 'Total newsletters shown afterwards').to.equal(2);
-//         });
-
-//         it('validates create newsletter before saving', async function () {
-//             await visit('/settings/newsletters');
-//             expect(findAll('[data-test-newsletter]').length, 'Total newsletters shown').to.equal(1);
-
-//             await click('[data-test-button="add-newsletter"]');
-
-//             // Check if modal opens
-//             expect(find('[data-test-modal="create-newsletter"]'), 'Create newsletter modal').to.exist;
-
-//             // Invalid name error when you try to save
-//             await checkValidationError({'input#newsletter-title': /Please enter a name./});
-
-//             // Fill in the newsletter name
-//             await fillName('My new newsletter');
-
-//             // Everything should be valid
-//             await checkSave({});
-
-//             expect(findAll('[data-test-newsletter]').length, 'Total newsletters shown afterwards').to.equal(2);
-//         });
-
-//         it('checks limits when creating a newsletter', async function () {
-//             const config = this.server.db.configs.find(1);
-//             config.hostSettings = {
-//                 limits: {
-//                     newsletters: {
-//                         max: 1,
-//                         error: 'Your plan supports up to {{max}} newsletters. Please upgrade to add more.'
-//                     }
-//                 }
-//             };
-//             this.server.db.configs.update(1, config);
-
-//             await visit('/settings/newsletters');
-//             await click('[data-test-button="add-newsletter"]');
-
-//             // Check if modal doesn't open
-//             expect(find('[data-test-modal="create-newsletter"]'), 'Create newsletter modal').not.to.exist;
-
-//             // Check limits modal is shown
-//             expect(find('[data-test-modal="limits/multiple-newsletters"]'), 'Limits modal').to.exist;
-
-//             // Check can close modal
-//             await click('[data-test-button="cancel-upgrade"]');
-
-//             // Check modal is closed
-//             expect(find('[data-test-modal="limits/multiple-newsletters"]'), 'Limits modal').not.to.exist;
-//         });
-//     });
-
-//     describe('Editing newsletters', function () {
-//         it('can edit via menu if multiple newsletters', async function () {
-//             // Create an extra newsletter
-//             this.server.create('newsletter', {status: 'active', name: 'test newsletter', slug: 'test-newsletter'});
-//             await visit('/settings/newsletters');
-
-//             await click('[data-test-newsletter-menu-trigger]');
-//             await click('[data-test-button="customize-newsletter"]');
-
-//             // Check if modal opens
-//             expect(find('[data-test-modal="edit-newsletter"]'), 'Edit newsletter modal').to.exist;
-//         });
-
-//         it('validates edit fields before saving', async function () {
-//             await visit('/settings/newsletters');
-
-//             // When we only have a single newsletter, the customize button is shown instead of the menu button
-//             await click('[data-test-button="customize-newsletter"]');
-
-//             // Check if modal opens
-//             expect(find('[data-test-modal="edit-newsletter"]'), 'Edit newsletter modal').to.exist;
-
-//             // Clear newsletter name
-//             await fillName('');
-
-//             // Invalid name error when you try to save
-//             await checkValidationError({'input#newsletter-title': /Please enter a name./});
-
-//             // Fill in the newsletter name
-//             await fillName('My new newsletter');
-
-//             // Enter an invalid email
-//             await openTab('general.email');
-//             await fillIn('input#newsletter-sender-email', 'invalid-email');
-
-//             // Check if it complains about the invalid email
-//             await checkValidationError({
-//                 'input#newsletter-sender-email': /Invalid email./
-//             });
-
-//             await fillIn('input#newsletter-sender-email', 'valid-email@email.com');
-
-//             // Everything should be valid
-//             await checkSave({
-//                 edit: true,
-//                 verifyEmail: /default email address \(noreply/
-//             });
-//         });
-
-//         it('can open / close all tabs', async function () {
-//             await visit('/settings/newsletters');
-
-//             // When we only have a single newsletter, the customize button is shown instead of the menu button
-//             await click('[data-test-button="customize-newsletter"]');
-
-//             // Check if modal opens
-//             expect(find('[data-test-modal="edit-newsletter"]'), 'Edit newsletter modal').to.exist;
-
-//             await openTab('general.name', false);
-//             await closeTab('general.name', false);
-
-//             await openTab('general.email', false);
-//             await closeTab('general.email', false);
-
-//             await openTab('general.member', false);
-//             await closeTab('general.member', false);
-
-//             // todo: uncomment after `audienceFeedback` feature flag will be removed
-//             //await openTab('general.audienceFeedback', false);
-//             //await closeTab('general.audienceFeedback', false);
-
-//             await openTab('design.header', false);
-//             await closeTab('design.header', false);
-
-//             await openTab('design.body', false);
-//             await closeTab('design.body', false);
-
-//             await openTab('design.footer', false);
-//             await closeTab('design.footer', false);
-//         });
-
-//         it('shows current sender email in verify modal', async function () {
-//             this.server.create('newsletter', {status: 'active', name: 'test newsletter', slug: 'test-newsletter', senderEmail: 'test@example.com'});
-
-//             await visit('/settings/newsletters');
-
-//             // Edit the last newsletter
-//             await click('[data-test-newsletter="test-newsletter"] [data-test-newsletter-menu-trigger]');
-//             await click('[data-test-button="customize-newsletter"]');
-
-//             // Check if modal opens
-//             expect(find('[data-test-modal="edit-newsletter"]'), 'Edit newsletter modal').to.exist;
-
-//             await openTab('general.email');
-//             await fillIn('input#newsletter-sender-email', 'valid-email@email.com');
-
-//             // Everything should be valid
-//             await checkSave({
-//                 edit: true,
-//                 verifyEmail: /previous email address \(test@example\.com\)/
-//             });
-//         });
-
-//         it('does not ask to confirm saved changes', async function () {
-//             await visit('/settings/newsletters');
-
-//             // When we only have a single newsletter, the customize button is shown instead of the menu button
-//             await click('[data-test-button="customize-newsletter"]');
-
-//             // Check if modal opens
-//             expect(find('[data-test-modal="edit-newsletter"]'), 'Edit newsletter modal').to.exist;
-
-//             // Make no changes
-
-//             // Everything should be valid
-//             await checkCancel({
-//                 edit: true,
-//                 shouldConfirm: false
-//             });
-//         });
-
-//         it('asks to confirm unsaved changes', async function () {
-//             async function doCheck(tabName, field) {
-//                 await visit('/settings/newsletters');
-
-//                 // When we only have a single newsletter, the customize button is shown instead of the menu button
-//                 await click('[data-test-button="customize-newsletter"]');
-
-//                 // Check if modal opens
-//                 expect(find('[data-test-modal="edit-newsletter"]'), 'Edit newsletter modal').to.exist;
-
-//                 // Make a change
-//                 await openTab(tabName, false);
-//                 if (field.input) {
-//                     await fillIn(field.input, field.value ?? 'my changed value');
-//                 } else if (field.toggle) {
-//                     await click(field.toggle);
-//                 } else if (field.dropdown) {
-//                     // Open dropdown
-//                     await click(`${field.dropdown} .ember-basic-dropdown-trigger`);
-
-//                     // Click first not-selected option
-//                     await click(`${field.dropdown} li.ember-power-select-option[aria-current="false"]`);
-//                 }
-
-//                 // Everything should be valid
-//                 await checkCancel({
-//                     edit: true,
-//                     shouldConfirm: true
-//                 });
-//             }
-
-//             // General name
-//             await doCheck('general.name', {
-//                 input: '#newsletter-title'
-//             });
-
-//             await doCheck('general.name', {
-//                 input: '#newsletter-description'
-//             });
-
-//             // General email
-//             await doCheck('general.email', {
-//                 input: '#newsletter-sender-name'
-//             });
-
-//             await doCheck('general.email', {
-//                 input: '#newsletter-sender-email'
-//             });
-
-//             await doCheck('general.email', {
-//                 input: '#newsletter-reply-to',
-//                 value: 'support'
-//             });
-
-//             // Member settings
-//             await doCheck.call(this, 'general.member', {
-//                 toggle: '[data-test-toggle="subscribeOnSignup"]'
-//             });
-
-//             // Newsletter analytics
-//             // todo: uncomment after `audienceFeedback` feature flag will be removed
-//             //await doCheck.call(this, 'general.audienceFeedback', {
-//             //    toggle: '[data-test-toggle="feedbackEnabled"]'
-//             //});
-
-//             // Design header
-//             await doCheck.call(this, 'design.header', {
-//                 toggle: '[data-test-toggle="showHeaderTitle"]'
-//             });
-
-//             await doCheck.call(this, 'design.header', {
-//                 toggle: '[data-test-toggle="showHeaderName"]'
-//             });
-
-//             // Design body
-//             await doCheck.call(this, 'design.body', {
-//                 dropdown: '[data-test-input="titleFontCategory"]'
-//             });
-
-//             await doCheck.call(this, 'design.body', {
-//                 toggle: '#newsletter-title-alignment button:not(.gh-btn-group-selected)'
-//             });
-
-//             await doCheck.call(this, 'design.body', {
-//                 dropdown: '[data-test-input="bodyFontCategory"]'
-//             });
-
-//             await doCheck.call(this, 'design.body', {
-//                 toggle: '#show-feature-image'
-//             });
-
-//             // Design footer
-//             await doCheck('design.footer', {
-//                 input: '[contenteditable="true"]'
-//             });
-//         });
-//     });
-
-//     describe('Archiving newsletters', function () {
-//         it('can archive newsletters', async function () {
-//             // Create an extra newsletter, because we cannot archive the last one
-//             this.server.create('newsletter', {status: 'active', name: 'test newsletter', slug: 'test-newsletter'});
-//             await visit('/settings/newsletters');
-
-//             // Check total newsletters shown
-//             expect(findAll('[data-test-newsletter]').length, 'Total newsletters shown').to.equal(2);
-
-//             // Toggle is hidden
-//             expect(find('[data-test-dropdown="newsletter-status-filter"] .ember-power-select-trigger')).not.to.exist;
-
-//             await click('[data-test-newsletter-menu-trigger]');
-//             await click('[data-test-button="archive-newsletter"]');
-
-//             // Check if confimation modal opens
-//             expect(find('[data-test-modal="confirm-newsletter-archive"]'), 'Archive newsletter modal').to.exist;
-
-//             // Confirm archive
-//             await click('[data-test-button="confirm-newsletter-archive"]');
-
-//             // Check total newsletters equals 1
-//             expect(findAll('[data-test-newsletter]').length, 'Total newsletters shown').to.equal(1);
-
-//             // Toggle is shown now
-//             expect(find('[data-test-dropdown="newsletter-status-filter"] .ember-power-select-trigger')).to.exist;
-//         });
-
-//         it('can reactivate newsletters if only archived newsletter left', async function () {
-//             // Create an extra newsletter, to check counts
-//             this.server.create('newsletter', {status: 'active', name: 'test newsletter', slug: 'test-newsletter'});
-
-//             // Create an archived newsletter, beacuse the toggle is invisible otherwise
-//             this.server.create('newsletter', {status: 'archived', name: 'test newsletter 2', slug: 'test-newsletter2'});
-//             await visit('/settings/newsletters');
-
-//             // Check total newsletters shown
-//             expect(findAll('[data-test-newsletter]').length, 'Total newsletters shown').to.equal(2);
-
-//             // Go to archived newsletters
-//             await click('[data-test-dropdown="newsletter-status-filter"] .ember-power-select-trigger');
-//             await click('.ember-power-select-option[aria-selected="false"]');
-
-//             // Check title okay
-//             expect(find('.gh-newsletters .gh-expandable-title').textContent.trim(), 'Title').to.equal('Archived newsletters');
-
-//             // Check total newsletters shown
-//             expect(findAll('[data-test-newsletter]').length, 'Total archived newsletters shown').to.equal(1);
-
-//             // Reactivate the newsletter
-//             await click('[data-test-newsletter-menu-trigger]');
-//             await click('[data-test-button="reactivate-newsletter"]');
-
-//             // Check if confimation modal opens
-//             expect(find('[data-test-modal="confirm-newsletter-reactivate"]'), 'Reactivate newsletter modal').to.exist;
-
-//             // Confirm archive
-//             await click('[data-test-button="confirm-newsletter-reactivate"]');
-
-//             // Check automatically went back to all (because no newsletters archived)
-//             // Check title okay
-//             expect(find('.gh-newsletters .gh-expandable-title').textContent.trim(), 'Title').to.equal('Active newsletters');
-
-//             // Check total newsletters shown
-//             expect(findAll('[data-test-newsletter]').length, 'Total newsletters shown').to.equal(3);
-//         });
-
-//         it('can reactivate newsletters', async function () {
-//             // Create an extra newsletter, to check counts
-//             this.server.create('newsletter', {status: 'active', name: 'test newsletter', slug: 'test-newsletter'});
-
-//             // Create an archived newsletter, beacuse the toggle is invisible otherwise
-//             this.server.create('newsletter', {status: 'archived', name: 'test newsletter 2', slug: 'test-newsletter2'});
-//             this.server.create('newsletter', {status: 'archived', name: 'test newsletter 3', slug: 'test-newsletter3'});
-//             await visit('/settings/newsletters');
-
-//             // Check total newsletters shown
-//             expect(findAll('[data-test-newsletter]').length, 'Total newsletters shown').to.equal(2);
-
-//             // Go to archived newsletters
-//             await click('[data-test-dropdown="newsletter-status-filter"] .ember-power-select-trigger');
-//             await click('.ember-power-select-option[aria-selected="false"]');
-
-//             // Check title okay
-//             expect(find('.gh-newsletters .gh-expandable-title').textContent.trim(), 'Title').to.equal('Archived newsletters');
-
-//             // Check total newsletters shown
-//             expect(findAll('[data-test-newsletter]').length, 'Total archived newsletters shown').to.equal(2);
-
-//             // Reactivate the newsletter
-//             await click('[data-test-newsletter-menu-trigger]');
-//             await click('[data-test-button="reactivate-newsletter"]');
-
-//             // Check if confimation modal opens
-//             expect(find('[data-test-modal="confirm-newsletter-reactivate"]'), 'Reactivate newsletter modal').to.exist;
-
-//             // Confirm archive
-//             await click('[data-test-button="confirm-newsletter-reactivate"]');
-
-//             // Check still showing archived newsletters
-//             expect(find('.gh-newsletters .gh-expandable-title').textContent.trim(), 'Title').to.equal('Archived newsletters');
-
-//             // Go to active newsletters
-//             await click('[data-test-dropdown="newsletter-status-filter"] .ember-power-select-trigger');
-//             await click('.ember-power-select-option[aria-selected="false"]');
-
-//             // Check automatically went back to all (because no newsletters archived)
-//             // Check title okay
-//             expect(find('.gh-newsletters .gh-expandable-title').textContent.trim(), 'Title').to.equal('Active newsletters');
-
-//             // Check total newsletters shown
-//             expect(findAll('[data-test-newsletter]').length, 'Total newsletters shown').to.equal(3);
-//         });
-
-//         it('checks limits when reactivating a newsletter', async function () {
-//             const config = this.server.db.configs.find(1);
-//             config.hostSettings = {
-//                 limits: {
-//                     newsletters: {
-//                         max: 1,
-//                         error: 'Your plan supports up to {{max}} newsletters. Please upgrade to add more.'
-//                     }
-//                 }
-//             };
-//             this.server.db.configs.update(1, config);
-
-//             // Create an archived newsletter, beacuse the toggle is invisible otherwise
-//             this.server.create('newsletter', {status: 'archived', name: 'test newsletter 2', slug: 'test-newsletter2'});
-//             await visit('/settings/newsletters');
-
-//             // Check total newsletters shown
-//             expect(findAll('[data-test-newsletter]').length, 'Total newsletters shown').to.equal(1);
-
-//             // Go to archived newsletters
-//             await click('[data-test-dropdown="newsletter-status-filter"] .ember-power-select-trigger');
-//             await click('.ember-power-select-option[aria-selected="false"]');
-
-//             // Check title okay
-//             expect(find('.gh-newsletters .gh-expandable-title').textContent.trim(), 'Title').to.equal('Archived newsletters');
-
-//             // Check total newsletters shown
-//             expect(findAll('[data-test-newsletter]').length, 'Total archived newsletters shown').to.equal(1);
-
-//             // Reactivate the newsletter
-//             await click('[data-test-newsletter-menu-trigger]');
-//             await click('[data-test-button="reactivate-newsletter"]');
-
-//             // Check if confimation modal doesn't open
-//             expect(find('[data-test-modal="confirm-newsletter-reactivate"]'), 'Reactivate newsletter modal').not.to.exist;
-
-//             // Check limits modal is shown
-//             expect(find('[data-test-modal="limits/multiple-newsletters"]'), 'Limits modal').to.exist;
-
-//             // Check can close modal
-//             await click('[data-test-button="cancel-upgrade"]');
-
-//             // Check modal is closed
-//             expect(find('[data-test-modal="limits/multiple-newsletters"]'), 'Limits modal').not.to.exist;
-//         });
-//     });
-// });
diff --git a/ghost/admin/tests/acceptance/settings/slack-test.js b/ghost/admin/tests/acceptance/settings/slack-test.js
deleted file mode 100644
index 830d1504520..00000000000
--- a/ghost/admin/tests/acceptance/settings/slack-test.js
+++ /dev/null
@@ -1,151 +0,0 @@
-// import ctrlOrCmd from 'ghost-admin/utils/ctrl-or-cmd';
-// import {Response} from 'miragejs';
-// import {authenticateSession, invalidateSession} from 'ember-simple-auth/test-support';
-// import {beforeEach, describe, it} from 'mocha';
-// import {blur, click, currentURL, fillIn, find, findAll, triggerEvent} from '@ember/test-helpers';
-// import {expect} from 'chai';
-// import {setupApplicationTest} from 'ember-mocha';
-// import {setupMirage} from 'ember-cli-mirage/test-support';
-// import {visit} from '../../helpers/visit';
-
-// describe('Acceptance: Settings - Integrations - Slack', function () {
-//     let hooks = setupApplicationTest();
-//     setupMirage(hooks);
-
-//     it('redirects to signin when not authenticated', async function () {
-//         await invalidateSession();
-//         await visit('/settings/integrations/slack');
-
-//         expect(currentURL(), 'currentURL').to.equal('/signin');
-//     });
-
-//     it('redirects to home page when authenticated as contributor', async function () {
-//         let role = this.server.create('role', {name: 'Contributor'});
-//         this.server.create('user', {roles: [role], slug: 'test-user'});
-
-//         await authenticateSession();
-//         await visit('/settings/integrations/slack');
-
-//         expect(currentURL(), 'currentURL').to.equal('/posts');
-//     });
-
-//     it('redirects to home page when authenticated as author', async function () {
-//         let role = this.server.create('role', {name: 'Author'});
-//         this.server.create('user', {roles: [role], slug: 'test-user'});
-
-//         await authenticateSession();
-//         await visit('/settings/integrations/slack');
-
-//         expect(currentURL(), 'currentURL').to.equal('/site');
-//     });
-
-//     it('redirects to home page when authenticated as editor', async function () {
-//         let role = this.server.create('role', {name: 'Editor'});
-//         this.server.create('user', {roles: [role], slug: 'test-user'});
-
-//         await authenticateSession();
-//         await visit('/settings/integrations/slack');
-
-//         expect(currentURL(), 'currentURL').to.equal('/site');
-//     });
-
-//     describe('when logged in', function () {
-//         beforeEach(async function () {
-//             let role = this.server.create('role', {name: 'Administrator'});
-//             this.server.create('user', {roles: [role]});
-
-//             return await authenticateSession();
-//         });
-
-//         it('it validates and saves slack settings properly', async function () {
-//             await visit('/settings/integrations/slack');
-
-//             // has correct url
-//             expect(currentURL(), 'currentURL').to.equal('/settings/integrations/slack');
-
-//             await fillIn('[data-test-slack-url-input]', 'notacorrecturl');
-//             await click('[data-test-save-button]');
-
-//             expect(find('[data-test-error="slack-url"]').textContent.trim(), 'inline validation response')
-//                 .to.equal('The URL must be in a format like https://hooks.slack.com/services/<your personal key>');
-
-//             // CMD-S shortcut works
-//             await fillIn('[data-test-slack-url-input]', 'https://hooks.slack.com/services/1275958430');
-//             await fillIn('[data-test-slack-username-input]', 'SlackBot');
-//             await triggerEvent('.gh-app', 'keydown', {
-//                 keyCode: 83, // s
-//                 metaKey: ctrlOrCmd === 'command',
-//                 ctrlKey: ctrlOrCmd === 'ctrl'
-//             });
-
-//             let [newRequest] = this.server.pretender.handledRequests.slice(-1);
-//             let params = JSON.parse(newRequest.requestBody);
-
-//             let urlResult = params.settings.findBy('key', 'slack_url').value;
-//             let usernameResult = params.settings.findBy('key', 'slack_username').value;
-
-//             expect(urlResult).to.equal('https://hooks.slack.com/services/1275958430');
-//             expect(usernameResult).to.equal('SlackBot');
-//             expect(find('[data-test-error="slack-url"]'), 'inline validation response')
-//                 .to.not.exist;
-
-//             await fillIn('[data-test-slack-url-input]', 'https://hooks.slack.com/services/1275958430');
-//             await click('[data-test-send-notification-button]');
-
-//             expect(findAll('.gh-notification').length, 'number of notifications').to.equal(1);
-//             expect(find('[data-test-error="slack-url"]'), 'inline validation response')
-//                 .to.not.exist;
-
-//             // modify model data or there will be no api call
-//             await fillIn('[data-test-slack-url-input]', 'https://hooks.slack.com/services/1275958431');
-
-//             this.server.put('/settings/', function () {
-//                 return new Response(422, {}, {
-//                     errors: [
-//                         {
-//                             type: 'ValidationError',
-//                             message: 'Test error'
-//                         }
-//                     ]
-//                 });
-//             });
-
-//             await click('.gh-notification .gh-notification-close');
-//             await click('[data-test-send-notification-button]');
-
-//             // we shouldn't try to send the test request if the save fails
-//             let [lastRequest] = this.server.pretender.handledRequests.slice(-1);
-//             expect(lastRequest.url).to.not.match(/\/slack\/test/);
-//             expect(findAll('.gh-notification').length, 'check slack notification after api validation error').to.equal(0);
-//         });
-
-//         it('warns when leaving without saving', async function () {
-//             await visit('/settings/integrations/slack');
-
-//             // has correct url
-//             expect(currentURL(), 'currentURL').to.equal('/settings/integrations/slack');
-
-//             await fillIn('[data-test-slack-url-input]', 'https://hooks.slack.com/services/1275958430');
-//             await blur('[data-test-slack-url-input]');
-
-//             await visit('/settings');
-
-//             expect(findAll('[data-test-modal="unsaved-settings"]').length, 'modal exists').to.equal(1);
-
-//             // Leave without saving
-//             await click('[data-test-modal="unsaved-settings"] [data-test-leave-button]');
-
-//             expect(currentURL(), 'currentURL').to.equal('/settings');
-
-//             await visit('/settings/integrations/slack');
-
-//             expect(currentURL(), 'currentURL').to.equal('/settings/integrations/slack');
-
-//             // settings were not saved
-//             expect(
-//                 find('[data-test-slack-url-input]').textContent.trim(),
-//                 'Slack Webhook URL'
-//             ).to.equal('');
-//         });
-//     });
-// });
diff --git a/ghost/admin/tests/acceptance/settings/unsplash-test.js b/ghost/admin/tests/acceptance/settings/unsplash-test.js
deleted file mode 100644
index 69032b48086..00000000000
--- a/ghost/admin/tests/acceptance/settings/unsplash-test.js
+++ /dev/null
@@ -1,132 +0,0 @@
-// import ctrlOrCmd from 'ghost-admin/utils/ctrl-or-cmd';
-// import {authenticateSession, invalidateSession} from 'ember-simple-auth/test-support';
-// import {
-//     beforeEach,
-//     describe,
-//     it
-// } from 'mocha';
-// import {click, currentURL, find, findAll, triggerEvent} from '@ember/test-helpers';
-// import {expect} from 'chai';
-// import {setupApplicationTest} from 'ember-mocha';
-// import {setupMirage} from 'ember-cli-mirage/test-support';
-// import {visit} from '../../helpers/visit';
-
-// describe('Acceptance: Settings - Integrations - Unsplash', function () {
-//     let hooks = setupApplicationTest();
-//     setupMirage(hooks);
-
-//     it('redirects to signin when not authenticated', async function () {
-//         await invalidateSession();
-//         await visit('/settings/integrations/unsplash');
-
-//         expect(currentURL(), 'currentURL').to.equal('/signin');
-//     });
-
-//     it('redirects to home page when authenticated as contributor', async function () {
-//         let role = this.server.create('role', {name: 'Contributor'});
-//         this.server.create('user', {roles: [role], slug: 'test-user'});
-
-//         await authenticateSession();
-//         await visit('/settings/integrations/unsplash');
-
-//         expect(currentURL(), 'currentURL').to.equal('/posts');
-//     });
-
-//     it('redirects to home page when authenticated as author', async function () {
-//         let role = this.server.create('role', {name: 'Author'});
-//         this.server.create('user', {roles: [role], slug: 'test-user'});
-
-//         await authenticateSession();
-//         await visit('/settings/integrations/unsplash');
-
-//         expect(currentURL(), 'currentURL').to.equal('/site');
-//     });
-
-//     it('redirects to home page when authenticated as editor', async function () {
-//         let role = this.server.create('role', {name: 'Editor'});
-//         this.server.create('user', {roles: [role], slug: 'test-user'});
-
-//         await authenticateSession();
-//         await visit('/settings/integrations/unsplash');
-
-//         expect(currentURL(), 'currentURL').to.equal('/site');
-//     });
-
-//     describe('when logged in', function () {
-//         beforeEach(async function () {
-//             let role = this.server.create('role', {name: 'Administrator'});
-//             this.server.create('user', {roles: [role]});
-
-//             return await authenticateSession();
-//         });
-
-//         it('it can activate/deactivate', async function () {
-//             await visit('/settings/integrations/unsplash');
-
-//             // has correct url
-//             expect(currentURL(), 'currentURL').to.equal('/settings/integrations/unsplash');
-
-//             // it's enabled by default when settings is empty
-//             expect(find('[data-test-unsplash-checkbox]').checked, 'checked by default').to.be.true;
-
-//             await click('[data-test-unsplash-checkbox]');
-
-//             expect(find('[data-test-unsplash-checkbox]').checked, 'unsplash checkbox').to.be.false;
-
-//             // trigger a save
-//             await click('[data-test-save-button]');
-
-//             // server should now have an unsplash setting
-//             let [lastRequest] = this.server.pretender.handledRequests.slice(-1);
-//             let params = JSON.parse(lastRequest.requestBody);
-
-//             expect(params.settings.findBy('key', 'unsplash').value).to.equal(false);
-
-//             // save via CMD-S shortcut
-//             await click('[data-test-unsplash-checkbox]');
-//             await triggerEvent('.gh-app', 'keydown', {
-//                 keyCode: 83, // s
-//                 metaKey: ctrlOrCmd === 'command',
-//                 ctrlKey: ctrlOrCmd === 'ctrl'
-//             });
-
-//             // we've already saved in this test so there's no on-screen indication
-//             // that we've had another save, check the request was fired instead
-//             let [newRequest] = this.server.pretender.handledRequests.slice(-1);
-//             params = JSON.parse(newRequest.requestBody);
-
-//             expect(find('[data-test-unsplash-checkbox]').checked, 'AMP checkbox').to.be.true;
-//             expect(params.settings.findBy('key', 'unsplash').value).to.equal(true);
-//         });
-
-//         it('warns when leaving without saving', async function () {
-//             await visit('/settings/integrations/unsplash');
-
-//             // has correct url
-//             expect(currentURL(), 'currentURL').to.equal('/settings/integrations/unsplash');
-
-//             // AMP is enabled by default
-//             expect(find('[data-test-unsplash-checkbox]').checked, 'AMP checkbox default').to.be.true;
-
-//             await click('[data-test-unsplash-checkbox]');
-
-//             expect(find('[data-test-unsplash-checkbox]').checked, 'Unsplash checkbox').to.be.false;
-
-//             await visit('/settings/labs');
-
-//             expect(findAll('[data-test-modal="unsaved-settings"]').length, 'unsaved changes modal exists').to.equal(1);
-
-//             // Leave without saving
-//             await click('[data-test-modal="unsaved-settings"] [data-test-leave-button]');
-
-//             expect(currentURL(), 'currentURL after leave without saving').to.equal('/settings/labs');
-
-//             await visit('/settings/integrations/unsplash');
-
-//             expect(currentURL(), 'currentURL').to.equal('/settings/integrations/unsplash');
-
-//             // settings were not saved
-//             expect(find('[data-test-unsplash-checkbox]').checked, 'Unsplash checkbox').to.be.true;
-//         });
-//     });
-// });
diff --git a/ghost/admin/tests/acceptance/settings/zapier-test.js b/ghost/admin/tests/acceptance/settings/zapier-test.js
deleted file mode 100644
index 11b92a5b135..00000000000
--- a/ghost/admin/tests/acceptance/settings/zapier-test.js
+++ /dev/null
@@ -1,69 +0,0 @@
-// import {authenticateSession, invalidateSession} from 'ember-simple-auth/test-support';
-// import {
-//     beforeEach,
-//     describe,
-//     it
-// } from 'mocha';
-// import {currentURL} from '@ember/test-helpers';
-// import {expect} from 'chai';
-// import {setupApplicationTest} from 'ember-mocha';
-// import {setupMirage} from 'ember-cli-mirage/test-support';
-// import {visit} from '../../helpers/visit';
-
-// describe('Acceptance: Settings - Integrations - Zapier', function () {
-//     let hooks = setupApplicationTest();
-//     setupMirage(hooks);
-
-//     it('redirects to signin when not authenticated', async function () {
-//         await invalidateSession();
-//         await visit('/settings/integrations/zapier');
-
-//         expect(currentURL(), 'currentURL').to.equal('/signin');
-//     });
-
-//     it('redirects to home page when authenticated as contributor', async function () {
-//         let role = this.server.create('role', {name: 'Contributor'});
-//         this.server.create('user', {roles: [role], slug: 'test-user'});
-
-//         await authenticateSession();
-//         await visit('/settings/integrations/zapier');
-
-//         expect(currentURL(), 'currentURL').to.equal('/posts');
-//     });
-
-//     it('redirects to home page when authenticated as author', async function () {
-//         let role = this.server.create('role', {name: 'Author'});
-//         this.server.create('user', {roles: [role], slug: 'test-user'});
-
-//         await authenticateSession();
-//         await visit('/settings/integrations/zapier');
-
-//         expect(currentURL(), 'currentURL').to.equal('/site');
-//     });
-
-//     it('redirects to home page when authenticated as editor', async function () {
-//         let role = this.server.create('role', {name: 'Editor'});
-//         this.server.create('user', {roles: [role], slug: 'test-user'});
-
-//         await authenticateSession();
-//         await visit('/settings/integrations/zapier');
-
-//         expect(currentURL(), 'currentURL').to.equal('/site');
-//     });
-
-//     describe('when logged in', function () {
-//         beforeEach(async function () {
-//             let role = this.server.create('role', {name: 'Administrator'});
-//             this.server.create('user', {roles: [role]});
-
-//             return await authenticateSession();
-//         });
-
-//         it('it loads', async function () {
-//             await visit('/settings/integrations/zapier');
-
-//             // has correct url
-//             expect(currentURL(), 'currentURL').to.equal('/settings/integrations/zapier');
-//         });
-//     });
-// });
diff --git a/ghost/admin/tests/acceptance/signup-test.js b/ghost/admin/tests/acceptance/signup-test.js
index 9d6ea83985f..b64c48a65ef 100644
--- a/ghost/admin/tests/acceptance/signup-test.js
+++ b/ghost/admin/tests/acceptance/signup-test.js
@@ -198,7 +198,7 @@ describe('Acceptance: Signup', function () {
         expect(find('.gh-alert-content').textContent).to.have.string('Invalid token');
     });
 
-    it('redirects with alert on non-existant or expired token', async function () {
+    it('redirects with alert on non-existent or expired token', async function () {
         this.server.get('/authentication/invitation', function () {
             return {
                 invitation: [{valid: false}]
diff --git a/ghost/admin/tests/acceptance/settings/tags-test.js b/ghost/admin/tests/acceptance/tags-test.js
similarity index 99%
rename from ghost/admin/tests/acceptance/settings/tags-test.js
rename to ghost/admin/tests/acceptance/tags-test.js
index bc4798ef810..bc8555c2dda 100644
--- a/ghost/admin/tests/acceptance/settings/tags-test.js
+++ b/ghost/admin/tests/acceptance/tags-test.js
@@ -5,7 +5,7 @@ import {click, currentRouteName, currentURL, fillIn, find, findAll} from '@ember
 import {expect} from 'chai';
 import {setupApplicationTest} from 'ember-mocha';
 import {setupMirage} from 'ember-cli-mirage/test-support';
-import {visit} from '../../helpers/visit';
+import {visit} from '../helpers/visit';
 
 describe('Acceptance: Tags', function () {
     let hooks = setupApplicationTest();
diff --git a/ghost/admin/tests/integration/components/gh-feature-flag-test.js b/ghost/admin/tests/integration/components/gh-feature-flag-test.js
deleted file mode 100644
index 9d5f27047a7..00000000000
--- a/ghost/admin/tests/integration/components/gh-feature-flag-test.js
+++ /dev/null
@@ -1,44 +0,0 @@
-import Service from '@ember/service';
-import hbs from 'htmlbars-inline-precompile';
-import {click, find, render} from '@ember/test-helpers';
-import {describe, it} from 'mocha';
-import {expect} from 'chai';
-import {setupRenderingTest} from 'ember-mocha';
-
-const featureStub = Service.extend({
-    testFlag: true
-});
-
-describe('Integration: Component: gh-feature-flag', function () {
-    setupRenderingTest();
-
-    beforeEach(function () {
-        this.owner.register('service:feature', featureStub);
-    });
-
-    it('renders properties correctly', async function () {
-        await render(hbs`<GhFeatureFlag @flag="testFlag" />`);
-        expect(find('label').getAttribute('for')).to.equal(find('input[type="checkbox"]').id);
-    });
-
-    it('renders correctly when flag is set to true', async function () {
-        await render(hbs`<GhFeatureFlag @flag="testFlag" />`);
-        expect(find('label input[type="checkbox"]').checked).to.be.true;
-    });
-
-    it('renders correctly when flag is set to false', async function () {
-        let feature = this.owner.lookup('service:feature');
-        feature.set('testFlag', false);
-
-        await render(hbs`<GhFeatureFlag @flag="testFlag" />`);
-        expect(find('label input[type="checkbox"]').checked).to.be.false;
-    });
-
-    it('updates to reflect changes in flag property', async function () {
-        await render(hbs`<GhFeatureFlag @flag="testFlag" />`);
-        expect(find('label input[type="checkbox"]').checked).to.be.true;
-
-        await click('label');
-        expect(find('label input[type="checkbox"]').checked).to.be.false;
-    });
-});
diff --git a/ghost/admin/tests/integration/components/gh-file-uploader-test.js b/ghost/admin/tests/integration/components/gh-file-uploader-test.js
deleted file mode 100644
index 2d50f0a6500..00000000000
--- a/ghost/admin/tests/integration/components/gh-file-uploader-test.js
+++ /dev/null
@@ -1,369 +0,0 @@
-import $ from 'jquery';
-import Pretender from 'pretender';
-import Service from '@ember/service';
-import ghostPaths from 'ghost-admin/utils/ghost-paths';
-import hbs from 'htmlbars-inline-precompile';
-import sinon from 'sinon';
-import {GENERIC_ERROR_MESSAGE} from 'ghost-admin/services/notifications';
-import {UnsupportedMediaTypeError} from 'ghost-admin/services/ajax';
-import {click, find, findAll, render, settled, triggerEvent} from '@ember/test-helpers';
-import {createFile, fileUpload} from '../../helpers/file-upload';
-import {describe, it} from 'mocha';
-import {expect} from 'chai';
-import {run} from '@ember/runloop';
-import {setupRenderingTest} from 'ember-mocha';
-
-const notificationsStub = Service.extend({
-    showAPIError() {
-        // noop - to be stubbed
-    }
-});
-
-const stubSuccessfulUpload = function (server, delay = 0) {
-    server.post(`${ghostPaths().apiRoot}/images/`, function () {
-        return [200, {'Content-Type': 'application/json'}, '{"url":"/content/images/test.png"}'];
-    }, delay);
-};
-
-const stubFailedUpload = function (server, code, error, delay = 0) {
-    server.post(`${ghostPaths().apiRoot}/images/`, function () {
-        return [code, {'Content-Type': 'application/json'}, JSON.stringify({
-            errors: [{
-                type: error,
-                message: `Error: ${error}`
-            }]
-        })];
-    }, delay);
-};
-
-describe('Integration: Component: gh-file-uploader', function () {
-    setupRenderingTest();
-
-    let server;
-
-    beforeEach(function () {
-        server = new Pretender();
-        this.set('uploadUrl', `${ghostPaths().apiRoot}/images/`);
-
-        this.owner.register('service:notifications', notificationsStub);
-    });
-
-    afterEach(function () {
-        server.shutdown();
-    });
-
-    it('renders', async function () {
-        await render(hbs`<GhFileUploader />`);
-
-        expect(find('label').textContent.trim(), 'default label')
-            .to.equal('Select or drag-and-drop a file');
-    });
-
-    it('allows file input "accept" attribute to be changed', async function () {
-        await render(hbs`<GhFileUploader />`);
-        expect(
-            find('input[type="file"]').getAttribute('accept'),
-            'default "accept" attribute'
-        ).to.equal('text/csv');
-
-        await render(hbs`<GhFileUploader @accept="application/zip" />`);
-        expect(
-            find('input[type="file"]').getAttribute('accept'),
-            'specified "accept" attribute'
-        ).to.equal('application/zip');
-    });
-
-    it('renders form with supplied label text', async function () {
-        this.set('labelText', 'My label');
-        await render(hbs`<GhFileUploader @labelText={{this.labelText}} />`);
-
-        expect(find('label').textContent.trim(), 'label')
-            .to.equal('My label');
-    });
-
-    it('generates request to supplied endpoint', async function () {
-        stubSuccessfulUpload(server);
-
-        await render(hbs`<GhFileUploader @url={{this.uploadUrl}} />`);
-        await fileUpload('input[type="file"]', ['test'], {name: 'test.csv'});
-
-        expect(server.handledRequests.length).to.equal(1);
-        expect(server.handledRequests[0].url).to.equal(`${ghostPaths().apiRoot}/images/`);
-    });
-
-    it('fires uploadSuccess action on successful upload', async function () {
-        let uploadSuccess = sinon.spy();
-        this.set('uploadSuccess', uploadSuccess);
-
-        stubSuccessfulUpload(server);
-
-        await render(hbs`<GhFileUploader @url={{this.uploadUrl}} @uploadSuccess={{this.uploadSuccess}} />`);
-        await fileUpload('input[type="file"]', ['test'], {name: 'test.csv'});
-
-        expect(uploadSuccess.calledOnce).to.be.true;
-        expect(uploadSuccess.firstCall.args[0]).to.eql({url: '/content/images/test.png'});
-    });
-
-    it('doesn\'t fire uploadSuccess action on failed upload', async function () {
-        let uploadSuccess = sinon.spy();
-        this.set('uploadSuccess', uploadSuccess);
-
-        stubFailedUpload(server, 500);
-
-        await render(hbs`<GhFileUploader @url={{this.uploadUrl}} @uploadSuccess={{this.uploadSuccess}} />`);
-        await fileUpload('input[type="file"]', ['test'], {name: 'test.csv'});
-
-        await settled();
-        expect(uploadSuccess.calledOnce).to.be.false;
-    });
-
-    it('fires fileSelected action on file selection', async function () {
-        let fileSelected = sinon.spy();
-        this.set('fileSelected', fileSelected);
-
-        stubSuccessfulUpload(server);
-
-        await render(hbs`<GhFileUploader @url={{this.uploadUrl}} @fileSelected={{this.fileSelected}} />`);
-        await fileUpload('input[type="file"]', ['test'], {name: 'test.csv'});
-
-        expect(fileSelected.calledOnce).to.be.true;
-        expect(fileSelected.args[0]).to.not.be.empty;
-    });
-
-    it('fires uploadStarted action on upload start', async function () {
-        let uploadStarted = sinon.spy();
-        this.set('uploadStarted', uploadStarted);
-
-        stubSuccessfulUpload(server);
-
-        await render(hbs`<GhFileUploader @url={{this.uploadUrl}} @uploadStarted={{this.uploadStarted}} />`);
-        await fileUpload('input[type="file"]', ['test'], {name: 'test.csv'});
-
-        expect(uploadStarted.calledOnce).to.be.true;
-    });
-
-    it('fires uploadFinished action on successful upload', async function () {
-        let uploadFinished = sinon.spy();
-        this.set('uploadFinished', uploadFinished);
-
-        stubSuccessfulUpload(server);
-
-        await render(hbs`<GhFileUploader @url={{this.uploadUrl}} @uploadFinished={{this.uploadFinished}} />`);
-        await fileUpload('input[type="file"]', ['test'], {name: 'test.csv'});
-
-        expect(uploadFinished.calledOnce).to.be.true;
-    });
-
-    it('fires uploadFinished action on failed upload', async function () {
-        let uploadFinished = sinon.spy();
-        this.set('uploadFinished', uploadFinished);
-
-        stubFailedUpload(server);
-
-        await render(hbs`<GhFileUploader @url={{this.uploadUrl}} @uploadFinished={{this.uploadFinished}} />`);
-        await fileUpload('input[type="file"]', ['test'], {name: 'test.csv'});
-
-        expect(uploadFinished.calledOnce).to.be.true;
-    });
-
-    it('displays invalid file type error', async function () {
-        stubFailedUpload(server, 415, 'UnsupportedMediaTypeError');
-        await render(hbs`<GhFileUploader @url={{this.uploadUrl}} />`);
-        await fileUpload('input[type="file"]', ['test'], {name: 'test.csv'});
-
-        expect(findAll('.failed').length, 'error message is displayed').to.equal(1);
-        expect(find('.failed').textContent).to.match(/The file type you uploaded is not supported/);
-        expect(findAll('[data-test-upload-try-again-button]').length, 'reset button is displayed').to.equal(1);
-        expect(find('[data-test-upload-try-again-button]').textContent).to.equal('Try again');
-    });
-
-    it('displays file too large for server error', async function () {
-        stubFailedUpload(server, 413, 'RequestEntityTooLargeError');
-        await render(hbs`<GhFileUploader @url={{this.uploadUrl}} />`);
-        await fileUpload('input[type="file"]', ['test'], {name: 'test.csv'});
-
-        expect(findAll('.failed').length, 'error message is displayed').to.equal(1);
-        expect(find('.failed').textContent).to.match(/The file you uploaded was larger/);
-    });
-
-    it('handles file too large error directly from the web server', async function () {
-        server.post(`${ghostPaths().apiRoot}/images/`, function () {
-            return [413, {}, ''];
-        });
-        await render(hbs`<GhFileUploader @url={{this.uploadUrl}} />`);
-        await fileUpload('input[type="file"]', ['test'], {name: 'test.csv'});
-
-        expect(findAll('.failed').length, 'error message is displayed').to.equal(1);
-        expect(find('.failed').textContent).to.match(/The file you uploaded was larger/);
-    });
-
-    it('displays other server-side error with message', async function () {
-        stubFailedUpload(server, 400, 'UnknownError');
-        await render(hbs`<GhFileUploader @url={{this.uploadUrl}} />`);
-        await fileUpload('input[type="file"]', ['test'], {name: 'test.csv'});
-
-        expect(findAll('.failed').length, 'error message is displayed').to.equal(1);
-        expect(find('.failed').textContent).to.match(/Error: UnknownError/);
-    });
-
-    it('handles unknown failure', async function () {
-        server.post(`${ghostPaths().apiRoot}/images/`, function () {
-            return [500, {'Content-Type': 'application/json'}, ''];
-        });
-        await render(hbs`<GhFileUploader @url={{this.uploadUrl}} />`);
-        await fileUpload('input[type="file"]', ['test'], {name: 'test.csv'});
-
-        expect(findAll('.failed').length, 'error message is displayed').to.equal(1);
-        expect(find('.failed').textContent).to.match(new RegExp(GENERIC_ERROR_MESSAGE));
-    });
-
-    it('triggers notifications.showAPIError for VersionMismatchError', async function () {
-        let showAPIError = sinon.spy();
-        let notifications = this.owner.lookup('service:notifications');
-        notifications.set('showAPIError', showAPIError);
-
-        stubFailedUpload(server, 400, 'VersionMismatchError');
-
-        await render(hbs`<GhFileUploader @url={{this.uploadUrl}} />`);
-        await fileUpload('input[type="file"]', ['test'], {name: 'test.csv'});
-
-        expect(showAPIError.calledOnce).to.be.true;
-    });
-
-    it('doesn\'t trigger notifications.showAPIError for other errors', async function () {
-        let showAPIError = sinon.spy();
-        let notifications = this.owner.lookup('service:notifications');
-        notifications.set('showAPIError', showAPIError);
-
-        stubFailedUpload(server, 400, 'UnknownError');
-        await render(hbs`<GhFileUploader @url={{this.uploadUrl}} />`);
-        await fileUpload('input[type="file"]', ['test'], {name: 'test.csv'});
-
-        expect(showAPIError.called).to.be.false;
-    });
-
-    it('can be reset after a failed upload', async function () {
-        stubFailedUpload(server, 400, 'UnknownError');
-        await render(hbs`<GhFileUploader @url={{this.uploadUrl}} />`);
-        await fileUpload('input[type="file"]', ['test'], {name: 'test.csv'});
-        await click('[data-test-upload-try-again-button]');
-
-        expect(findAll('input[type="file"]').length).to.equal(1);
-    });
-
-    it('handles drag over/leave', async function () {
-        await render(hbs`<GhFileUploader />`);
-
-        run(() => {
-            // eslint-disable-next-line new-cap
-            let dragover = $.Event('dragover', {
-                dataTransfer: {
-                    files: []
-                }
-            });
-            $(find('.gh-image-uploader')).trigger(dragover);
-        });
-
-        await settled();
-
-        expect(find('.gh-image-uploader').classList.contains('-drag-over'), 'has drag-over class').to.be.true;
-
-        await triggerEvent('.gh-image-uploader', 'dragleave');
-
-        expect(find('.gh-image-uploader').classList.contains('-drag-over'), 'has drag-over class').to.be.false;
-    });
-
-    it('triggers file upload on file drop', async function () {
-        let uploadSuccess = sinon.spy();
-        // eslint-disable-next-line new-cap
-        let drop = $.Event('drop', {
-            dataTransfer: {
-                files: [createFile(['test'], {name: 'test.csv'})]
-            }
-        });
-
-        this.set('uploadSuccess', uploadSuccess);
-
-        stubSuccessfulUpload(server);
-        await render(hbs`<GhFileUploader @url={{this.uploadUrl}} @uploadSuccess={{this.uploadSuccess}} />`);
-
-        run(() => {
-            $(find('.gh-image-uploader')).trigger(drop);
-        });
-
-        await settled();
-
-        expect(uploadSuccess.calledOnce).to.be.true;
-        expect(uploadSuccess.firstCall.args[0]).to.eql({url: '/content/images/test.png'});
-    });
-
-    it('validates extension by default', async function () {
-        let uploadSuccess = sinon.spy();
-        let uploadFailed = sinon.spy();
-
-        this.set('uploadSuccess', uploadSuccess);
-        this.set('uploadFailed', uploadFailed);
-
-        stubSuccessfulUpload(server);
-
-        await render(hbs`<GhFileUploader
-            @url={{this.uploadUrl}}
-            @uploadSuccess={{this.uploadSuccess}}
-            @uploadFailed={{this.uploadFailed}} />`);
-
-        await fileUpload('input[type="file"]', ['test'], {name: 'test.txt'});
-
-        expect(uploadSuccess.called).to.be.false;
-        expect(uploadFailed.calledOnce).to.be.true;
-        expect(findAll('.failed').length, 'error message is displayed').to.equal(1);
-        expect(find('.failed').textContent).to.match(/The file type you uploaded is not supported/);
-    });
-
-    it('uploads if validate action supplied and returns true', async function () {
-        let validate = sinon.stub().returns(true);
-        let uploadSuccess = sinon.spy();
-
-        this.set('validate', validate);
-        this.set('uploadSuccess', uploadSuccess);
-
-        stubSuccessfulUpload(server);
-
-        await render(hbs`<GhFileUploader
-            @url={{this.uploadUrl}}
-            @uploadSuccess={{this.uploadSuccess}}
-            @validate={{this.validate}} />`);
-
-        await fileUpload('input[type="file"]', ['test'], {name: 'test.csv'});
-
-        await settled();
-
-        expect(validate.calledOnce).to.be.true;
-        expect(uploadSuccess.calledOnce).to.be.true;
-    });
-
-    it('skips upload and displays error if validate action supplied and doesn\'t return true', async function () {
-        let validate = sinon.stub().returns(new UnsupportedMediaTypeError());
-        let uploadSuccess = sinon.spy();
-        let uploadFailed = sinon.spy();
-
-        this.set('validate', validate);
-        this.set('uploadSuccess', uploadSuccess);
-        this.set('uploadFailed', uploadFailed);
-
-        stubSuccessfulUpload(server);
-
-        await render(hbs`<GhFileUploader
-            @url={{this.uploadUrl}}
-            @uploadSuccess={{this.uploadSuccess}}
-            @uploadFailed={{this.uploadFailed}}
-            @validate={{this.validate}} />`);
-
-        await fileUpload('input[type="file"]', ['test'], {name: 'test.csv'});
-
-        expect(validate.calledOnce).to.be.true;
-        expect(uploadSuccess.called).to.be.false;
-        expect(uploadFailed.calledOnce).to.be.true;
-        expect(findAll('.failed').length, 'error message is displayed').to.equal(1);
-        expect(find('.failed').textContent).to.match(/The file type you uploaded is not supported/);
-    });
-});
diff --git a/ghost/admin/tests/integration/components/gh-theme-table-test.js b/ghost/admin/tests/integration/components/gh-theme-table-test.js
deleted file mode 100644
index cc274cf5cce..00000000000
--- a/ghost/admin/tests/integration/components/gh-theme-table-test.js
+++ /dev/null
@@ -1,158 +0,0 @@
-import hbs from 'htmlbars-inline-precompile';
-import {click, find, findAll, render} from '@ember/test-helpers';
-import {describe, it} from 'mocha';
-import {expect} from 'chai';
-import {setupRenderingTest} from 'ember-mocha';
-
-describe('Integration: Component: gh-theme-table', function () {
-    setupRenderingTest();
-
-    it('renders', async function () {
-        this.set('themes', [
-            {name: 'Daring', package: {name: 'Daring', version: '0.1.4'}, active: true},
-            {name: 'casper', package: {name: 'Casper', version: '1.3.1'}},
-            {name: 'source', package: {name: 'Source', version: '1.0.0'}},
-            {name: 'oscar-ghost-1.1.0', package: {name: 'Lanyon', version: '1.1.0'}},
-            {name: 'foo'}
-        ]);
-
-        await render(hbs`<GhThemeTable @themes={{themes}} />`);
-
-        expect(findAll('[data-test-themes-list]').length, 'themes list is present').to.equal(1);
-        expect(findAll('[data-test-theme-id]').length, 'number of rows').to.equal(5);
-
-        let packageNames = findAll('[data-test-theme-title]').map(name => name.textContent.trim());
-
-        expect(packageNames[0]).to.match(/Casper \(legacy\)/);
-        expect(packageNames[1]).to.match(/Daring\s+Active/);
-        expect(packageNames[2]).to.match(/foo/);
-        expect(packageNames[3]).to.match(/Lanyon/);
-        expect(packageNames[4]).to.match(/Source \(default\)/);
-
-        expect(
-            find('[data-test-theme-active="true"]').querySelector('[data-test-theme-title]'),
-            'active theme is highlighted'
-        ).to.contain.text('Daring');
-
-        expect(
-            findAll('[data-test-button="activate"]').length,
-            'non-active themes have an activate link'
-        ).to.equal(4);
-
-        expect(
-            find('[data-test-theme-active="true"]').querySelector('[data-test-button="activate"]'),
-            'active theme doesn\'t have an activate link'
-        ).to.not.exist;
-    });
-
-    it('has download button in actions dropdown for all themes', async function () {
-        const themes = [
-            {name: 'Daring', package: {name: 'Daring', version: '0.1.4'}, active: true},
-            {name: 'casper', package: {name: 'Casper', version: '1.3.1'}},
-            {name: 'oscar-ghost-1.1.0', package: {name: 'Lanyon', version: '1.1.0'}},
-            {name: 'foo'}
-        ];
-        this.set('themes', themes);
-
-        await render(hbs`<GhThemeTable @themes={{themes}} />`);
-
-        for (const theme of themes) {
-            await click(`[data-test-theme-id="${theme.name}"] [data-test-button="actions"]`);
-            expect(
-                find(`[data-test-actions-for="${theme.name}"] [data-test-button="download"]`)
-            ).to.exist;
-        }
-    });
-
-    it('has delete button for non-active, non-default, themes', async function () {
-        const themes = [
-            {name: 'Daring', package: {name: 'Daring', version: '0.1.4'}},
-            {name: 'oscar-ghost-1.1.0', package: {name: 'Lanyon', version: '1.1.0'}},
-            {name: 'foo'}
-        ];
-        this.set('themes', themes);
-
-        await render(hbs`<GhThemeTable @themes={{themes}} />`);
-
-        for (const theme of themes) {
-            await click(`[data-test-theme-id="${theme.name}"] [data-test-button="actions"]`);
-            expect(
-                find(`[data-test-actions-for="${theme.name}"] [data-test-button="delete"]`)
-            ).to.exist;
-        }
-    });
-
-    it('does not show delete action for default themes', async function () {
-        const themes = [
-            {name: 'Daring', package: {name: 'Daring', version: '0.1.4'}, active: true},
-            {name: 'casper', package: {name: 'Casper', version: '1.3.1'}},
-            {name: 'oscar-ghost-1.1.0', package: {name: 'Lanyon', version: '1.1.0'}},
-            {name: 'foo'},
-            {name: 'source', package: {name: 'Source', version: '1.0.0'}}
-        ];
-        this.set('themes', themes);
-
-        await render(hbs`<GhThemeTable @themes={{themes}} />`);
-
-        // Casper should not be deletable
-        await click(`[data-test-theme-id="casper"] [data-test-button="actions"]`);
-        expect(find('[data-test-actions-for="casper"]')).to.exist;
-        expect(
-            find(`[data-test-actions-for="casper"] [data-test-button="delete"]`)
-        ).to.not.exist;
-
-        // Source should not be deletable
-        await click(`[data-test-theme-id="source"] [data-test-button="actions"]`);
-        expect(find('[data-test-actions-for="source"]')).to.exist;
-        expect(
-            find(`[data-test-actions-for="source"] [data-test-button="delete"]`)
-        ).to.not.exist;
-    });
-
-    it('does not show delete action for active theme', async function () {
-        const themes = [
-            {name: 'Daring', package: {name: 'Daring', version: '0.1.4'}, active: true},
-            {name: 'casper', package: {name: 'Casper', version: '1.3.1'}},
-            {name: 'oscar-ghost-1.1.0', package: {name: 'Lanyon', version: '1.1.0'}},
-            {name: 'foo'}
-        ];
-        this.set('themes', themes);
-
-        await render(hbs`<GhThemeTable @themes={{themes}} />`);
-
-        await click(`[data-test-theme-id="Daring"] [data-test-button="actions"]`);
-        expect(find('[data-test-actions-for="Daring"]')).to.exist;
-        expect(
-            find(`[data-test-actions-for="Daring"] [data-test-button="delete"]`)
-        ).to.not.exist;
-    });
-
-    it('displays folder names if there are duplicate package names', async function () {
-        this.set('themes', [
-            {name: 'daring', package: {name: 'Daring', version: '0.1.4'}},
-            {name: 'daring-0.1.5', package: {name: 'Daring', version: '0.1.4'}},
-            {name: 'source', package: {name: 'Source', version: '1.0.0'}},
-            {name: 'casper', package: {name: 'Casper', version: '1.3.1'}},
-            {name: 'another', package: {name: 'Casper', version: '1.3.1'}},
-            {name: 'mine', package: {name: 'Casper', version: '1.3.1'}},
-            {name: 'foo'}
-        ]);
-
-        await render(hbs`<GhThemeTable @themes={{themes}} />`);
-
-        let packageNames = findAll('[data-test-theme-title]').map(name => name.textContent.trim());
-
-        expect(
-            packageNames,
-            'themes are ordered by label, folder names shown for duplicates'
-        ).to.deep.equal([
-            'Casper (another)',
-            'Casper (legacy)',
-            'Casper (mine)',
-            'Daring (daring)',
-            'Daring (daring-0.1.5)',
-            'foo',
-            'Source (default)'
-        ]);
-    });
-});
diff --git a/ghost/admin/tests/integration/components/gh-timezone-select-test.js b/ghost/admin/tests/integration/components/gh-timezone-select-test.js
deleted file mode 100644
index 764aad73b80..00000000000
--- a/ghost/admin/tests/integration/components/gh-timezone-select-test.js
+++ /dev/null
@@ -1,68 +0,0 @@
-import hbs from 'htmlbars-inline-precompile';
-import sinon from 'sinon';
-import {blur, fillIn, find, findAll, render} from '@ember/test-helpers';
-import {describe, it} from 'mocha';
-import {expect} from 'chai';
-import {setupRenderingTest} from 'ember-mocha';
-
-describe('Integration: Component: gh-timezone-select', function () {
-    setupRenderingTest();
-
-    beforeEach(function () {
-        this.set('availableTimezones', [
-            {name: 'Pacific/Pago_Pago', label: '(GMT -11:00) Midway Island, Samoa'},
-            {name: 'Etc/UTC', label: '(GMT) UTC'},
-            {name: 'Pacific/Kwajalein', label: '(GMT +12:00) International Date Line West'}
-        ]);
-        this.set('timezone', 'Etc/UTC');
-    });
-
-    it('renders', async function () {
-        await render(hbs`<GhTimezoneSelect
-            @availableTimezones={{this.availableTimezones}}
-            @timezone={{this.timezone}}
-        />`);
-
-        expect(this.element, 'top-level elements').to.exist;
-        expect(findAll('option'), 'number of options').to.have.length(3);
-        expect(find('select').value, 'selected option value').to.equal('Etc/UTC');
-    });
-
-    it('handles an unknown timezone', async function () {
-        this.set('timezone', 'Europe/London');
-
-        await render(hbs`<GhTimezoneSelect
-            @availableTimezones={{this.availableTimezones}}
-            @timezone={{this.timezone}}
-        />`);
-
-        // we have an additional blank option at the top
-        expect(findAll('option'), 'number of options').to.have.length(4);
-        // blank option is selected
-        expect(find('select').value, 'selected option value').to.equal('');
-        // we indicate the manual override
-        expect(find('p').textContent).to.match(/Your timezone has been automatically set to Europe\/London/);
-    });
-
-    it('triggers update action on change', async function () {
-        let update = sinon.spy();
-        this.set('update', update);
-
-        await render(hbs`<GhTimezoneSelect
-            @availableTimezones={{this.availableTimezones}}
-            @timezone={{this.timezone}}
-            @update={{this.update}}
-        />`);
-
-        await fillIn('select', 'Pacific/Pago_Pago');
-        await blur('select');
-
-        expect(update.calledOnce, 'update was called once').to.be.true;
-        expect(update.firstCall.args[0].name, 'update was passed new timezone')
-            .to.equal('Pacific/Pago_Pago');
-    });
-
-    // TODO: mock clock service, fake the time, test we have the correct
-    // local time and it changes alongside selection changes
-    it('renders local time');
-});
diff --git a/ghost/admin/tests/integration/components/gh-unsplash-test.js b/ghost/admin/tests/integration/components/gh-unsplash-test.js
index f5b1631de79..916b2e1f03a 100644
--- a/ghost/admin/tests/integration/components/gh-unsplash-test.js
+++ b/ghost/admin/tests/integration/components/gh-unsplash-test.js
@@ -37,7 +37,7 @@ describe('Integration: Component: gh-unsplash', function () {
 
     describe('closing', function () {
         it('triggers close action');
-        it('can be triggerd by escape key');
+        it('can be triggered by escape key');
         it('cannot be triggered by escape key when zoomed');
     });
 });
diff --git a/ghost/admin/tests/integration/components/settings/navigation/nav-item-test.js b/ghost/admin/tests/integration/components/settings/navigation/nav-item-test.js
deleted file mode 100644
index 13acf318eca..00000000000
--- a/ghost/admin/tests/integration/components/settings/navigation/nav-item-test.js
+++ /dev/null
@@ -1,123 +0,0 @@
-import NavItem from 'ghost-admin/models/navigation-item';
-import hbs from 'htmlbars-inline-precompile';
-import {click, find, render, triggerEvent} from '@ember/test-helpers';
-import {describe, it} from 'mocha';
-import {expect} from 'chai';
-import {setupRenderingTest} from 'ember-mocha';
-
-describe('Integration: Component: settings/navigation/nav-item', function () {
-    setupRenderingTest();
-
-    beforeEach(function () {
-        this.set('baseUrl', 'http://localhost:2368');
-    });
-
-    it('renders', async function () {
-        this.set('navItem', NavItem.create({label: 'Test', url: '/url'}));
-
-        await render(hbs`<Settings::Navigation::NavItem @navItem={{this.navItem}} @baseUrl={{this.baseUrl}} />`);
-        let item = find('.gh-blognav-item');
-
-        expect(item.querySelector('.gh-blognav-grab'), 'grab').to.exist;
-        expect(item.querySelector('.gh-blognav-label'), 'label').to.exist;
-        expect(item.querySelector('.gh-blognav-url'), 'url').to.exist;
-        expect(item.querySelector('.gh-blognav-delete'), 'delete').to.exist;
-
-        // doesn't show any errors
-        expect(find('.gh-blognav-item--error')).to.not.exist;
-        expect(find('.error')).to.not.exist;
-        expect(find('.response')).to.not.be.displayed;
-    });
-
-    it('doesn\'t show drag handle for new items', async function () {
-        this.set('navItem', NavItem.create({label: 'Test', url: '/url', isNew: true}));
-
-        await render(hbs`<Settings::Navigation::NavItem @navItem={{this.navItem}} @baseUrl={{this.baseUrl}} />`);
-        let item = find('.gh-blognav-item');
-
-        expect(item.querySelector('.gh-blognav-grab')).to.not.exist;
-    });
-
-    it('shows add button for new items', async function () {
-        this.set('navItem', NavItem.create({label: 'Test', url: '/url', isNew: true}));
-
-        await render(hbs`<Settings::Navigation::NavItem @navItem={{this.navItem}} @baseUrl={{this.baseUrl}} />`);
-        let item = find('.gh-blognav-item');
-
-        expect(item.querySelector('.gh-blognav-add')).to.exist;
-        expect(item.querySelector('.gh-blognav-delete')).to.not.exist;
-    });
-
-    it('triggers delete action', async function () {
-        this.set('navItem', NavItem.create({label: 'Test', url: '/url'}));
-
-        let deleteActionCallCount = 0;
-        this.set('deleteItem', (navItem) => {
-            expect(navItem).to.equal(this.navItem);
-            deleteActionCallCount += 1;
-        });
-
-        await render(hbs`<Settings::Navigation::NavItem @navItem={{this.navItem}} @baseUrl={{this.baseUrl}} @deleteItem={{this.deleteItem}} />`);
-        await click('.gh-blognav-delete');
-
-        expect(deleteActionCallCount).to.equal(1);
-    });
-
-    it('triggers add action', async function () {
-        this.set('navItem', NavItem.create({label: 'Test', url: '/url', isNew: true}));
-
-        let addActionCallCount = 0;
-        this.set('add', () => {
-            addActionCallCount += 1;
-        });
-
-        await render(hbs`<Settings::Navigation::NavItem @navItem={{this.navItem}} @baseUrl={{this.baseUrl}} @addItem={{this.add}} />`);
-        await click('.gh-blognav-add');
-
-        expect(addActionCallCount).to.equal(1);
-    });
-
-    it('triggers update url action', async function () {
-        this.set('navItem', NavItem.create({label: 'Test', url: '/url'}));
-
-        let updateActionCallCount = 0;
-        this.set('update', (value) => {
-            updateActionCallCount += 1;
-            return value;
-        });
-
-        await render(hbs`<Settings::Navigation::NavItem @navItem={{this.navItem}} @baseUrl={{this.baseUrl}} @updateUrl={{this.update}} />`);
-        await triggerEvent('.gh-blognav-url input', 'blur');
-
-        expect(updateActionCallCount).to.equal(1);
-    });
-
-    it('triggers update label action', async function () {
-        this.set('navItem', NavItem.create({label: 'Test', url: '/url'}));
-
-        let updateActionCallCount = 0;
-        this.set('update', (value) => {
-            updateActionCallCount += 1;
-            return value;
-        });
-
-        await render(hbs`<Settings::Navigation::NavItem @navItem={{this.navItem}} @baseUrl={{this.baseUrl}} @updateLabel={{this.update}} />`);
-        await triggerEvent('.gh-blognav-label input', 'blur');
-
-        expect(updateActionCallCount).to.equal(2);
-    });
-
-    it('displays inline errors', async function () {
-        this.set('navItem', NavItem.create({label: '', url: ''}));
-        this.navItem.validate();
-
-        await render(hbs`<Settings::Navigation::NavItem @navItem={{this.navItem}} @baseUrl={{this.baseUrl}} />`);
-        let item = find('.gh-blognav-item');
-
-        expect(item).to.have.class('gh-blognav-item--error');
-        expect(item.querySelector('.gh-blognav-label')).to.have.class('error');
-        expect(item.querySelector('.gh-blognav-label .response')).to.have.trimmed.text('You must specify a label');
-        expect(item.querySelector('.gh-blognav-url')).to.have.class('error');
-        expect(item.querySelector('.gh-blognav-url .response')).to.have.trimmed.text('You must specify a URL or relative path');
-    });
-});
diff --git a/ghost/admin/tests/integration/components/settings/navigation/nav-item-url-input-test.js b/ghost/admin/tests/integration/components/settings/navigation/nav-item-url-input-test.js
deleted file mode 100644
index 8e8453e7f7a..00000000000
--- a/ghost/admin/tests/integration/components/settings/navigation/nav-item-url-input-test.js
+++ /dev/null
@@ -1,408 +0,0 @@
-import hbs from 'htmlbars-inline-precompile';
-import {blur, click, fillIn, find, findAll, render, triggerKeyEvent} from '@ember/test-helpers';
-import {describe, it} from 'mocha';
-import {expect} from 'chai';
-import {setupRenderingTest} from 'ember-mocha';
-
-// we want baseUrl to match the running domain so relative URLs are
-// handled as expected (browser auto-sets the domain when using a.href)
-let currentUrl = `${window.location.protocol}//${window.location.host}/`;
-
-describe('Integration: Component: settings/navigation/nav-item-url-input', function () {
-    setupRenderingTest();
-
-    beforeEach(function () {
-        // set defaults
-        this.set('baseUrl', currentUrl);
-        this.set('url', '');
-        this.set('isNew', false);
-        this.set('clearErrors', function () {
-            return null;
-        });
-    });
-
-    it('renders correctly with blank url', async function () {
-        await render(hbs`
-            <Settings::Navigation::NavItemUrlInput @baseUrl={{this.baseUrl}} @url={{this.url}} @isNew={{this.isNew}} @clearErrors={{this.clearErrors}} />
-        `);
-
-        expect(findAll('input')).to.have.length(1);
-        expect(find('input')).to.have.class('gh-input');
-        expect(find('input')).to.have.value(currentUrl);
-    });
-
-    it('renders correctly with relative urls', async function () {
-        this.set('url', '/about');
-        await render(hbs`
-            <Settings::Navigation::NavItemUrlInput @baseUrl={{this.baseUrl}} @url={{this.url}} @isNew={{this.isNew}} @clearErrors={{this.clearErrors}} />
-        `);
-
-        expect(find('input')).to.have.value(`${currentUrl}about`);
-
-        this.set('url', '/about#contact');
-        expect(find('input')).to.have.value(`${currentUrl}about#contact`);
-    });
-
-    it('renders correctly with absolute urls', async function () {
-        this.set('url', 'https://example.com:2368/#test');
-        await render(hbs`
-            <Settings::Navigation::NavItemUrlInput @baseUrl={{this.baseUrl}} @url={{this.url}} @isNew={{this.isNew}} @clearErrors={{this.clearErrors}} />
-        `);
-
-        expect(find('input')).to.have.value('https://example.com:2368/#test');
-
-        this.set('url', 'mailto:test@example.com');
-        expect(find('input')).to.have.value('mailto:test@example.com');
-
-        this.set('url', 'tel:01234-5678-90');
-        expect(find('input')).to.have.value('tel:01234-5678-90');
-
-        this.set('url', '//protocol-less-url.com');
-        expect(find('input')).to.have.value('//protocol-less-url.com');
-
-        this.set('url', '#anchor');
-        expect(find('input')).to.have.value('#anchor');
-    });
-
-    it('deletes base URL on backspace', async function () {
-        await render(hbs`
-            <Settings::Navigation::NavItemUrlInput @baseUrl={{this.baseUrl}} @url={{this.url}} @isNew={{this.isNew}} @clearErrors={{this.clearErrors}} />
-        `);
-
-        expect(find('input')).to.have.value(currentUrl);
-        await triggerKeyEvent('input', 'keydown', 8);
-        expect(find('input')).to.have.value('');
-    });
-
-    it('deletes base URL on delete', async function () {
-        await render(hbs`
-            <Settings::Navigation::NavItemUrlInput @baseUrl={{this.baseUrl}} @url={{this.url}} @isNew={{this.isNew}} @clearErrors={{this.clearErrors}} />
-        `);
-
-        expect(find('input')).to.have.value(currentUrl);
-        await triggerKeyEvent('input', 'keydown', 46);
-        expect(find('input')).to.have.value('');
-    });
-
-    it('adds base url to relative urls on blur', async function () {
-        this.set('updateUrl', val => val);
-        await render(hbs`
-            <Settings::Navigation::NavItemUrlInput @baseUrl={{this.baseUrl}} @url={{this.url}} @isNew={{this.isNew}} @update={{this.updateUrl}} @clearErrors={{this.clearErrors}} />
-        `);
-
-        await fillIn('input', '/about');
-        await blur('input');
-
-        expect(find('input')).to.have.value(`${currentUrl}about/`);
-    });
-
-    it('adds "mailto:" to email addresses on blur', async function () {
-        this.set('updateUrl', val => val);
-        await render(hbs`
-            <Settings::Navigation::NavItemUrlInput @baseUrl={{this.baseUrl}} @url={{this.url}} @isNew={{this.isNew}} @update={{this.updateUrl}} @clearErrors={{this.clearErrors}} />
-        `);
-
-        await fillIn('input', 'test@example.com');
-        await blur('input');
-
-        expect(find('input')).to.have.value('mailto:test@example.com');
-
-        // ensure we don't double-up on the mailto:
-        await blur('input');
-        expect(find('input')).to.have.value('mailto:test@example.com');
-    });
-
-    it('doesn\'t add base url to invalid urls on blur', async function () {
-        this.set('updateUrl', val => val);
-        await render(hbs`
-            <Settings::Navigation::NavItemUrlInput @baseUrl={{this.baseUrl}} @url={{this.url}} @isNew={{this.isNew}} @update={{this.updateUrl}} @clearErrors={{this.clearErrors}} />
-        `);
-
-        let changeValue = async (value) => {
-            await fillIn('input', value);
-            await blur('input');
-        };
-
-        await changeValue('with spaces');
-        expect(find('input')).to.have.value('with spaces');
-
-        await changeValue('/with spaces');
-        expect(find('input')).to.have.value('/with spaces');
-    });
-
-    it('doesn\'t mangle invalid urls on blur', async function () {
-        this.set('updateUrl', val => val);
-        await render(hbs`
-            <Settings::Navigation::NavItemUrlInput @baseUrl={{this.baseUrl}} @url={{this.url}} @isNew={{this.isNew}} @update={{this.updateUrl}} @clearErrors={{this.clearErrors}} />
-        `);
-
-        await fillIn('input', `${currentUrl} /test`);
-        await blur('input');
-
-        expect(find('input')).to.have.value(`${currentUrl} /test`);
-    });
-
-    // https://github.com/TryGhost/Ghost/issues/9373
-    it('doesn\'t mangle urls when baseUrl has unicode characters', async function () {
-        this.set('updateUrl', val => val);
-
-        this.set('baseUrl', 'http://exämple.com');
-
-        await render(hbs`
-            <Settings::Navigation::NavItemUrlInput @baseUrl={{this.baseUrl}} @url={{this.url}} @isNew={{this.isNew}} @update={{this.updateUrl}} @clearErrors={{this.clearErrors}} />
-        `);
-        await fillIn('input', `${currentUrl}/test`);
-        await blur('input');
-
-        expect(find('input')).to.have.value(`${currentUrl}/test`);
-    });
-
-    it('triggers "update" action on blur', async function () {
-        let changeActionCallCount = 0;
-        this.set('updateUrl', (val) => {
-            changeActionCallCount += 1;
-            return val;
-        });
-
-        await render(hbs `
-            <Settings::Navigation::NavItemUrlInput @baseUrl={{this.baseUrl}} @url={{this.url}} @isNew={{this.isNew}} @update={{this.updateUrl}} @clearErrors={{this.clearErrors}} />
-        `);
-        await click('input');
-        await blur('input');
-
-        expect(changeActionCallCount).to.equal(1);
-    });
-
-    it('triggers "update" action on enter', async function () {
-        let changeActionCallCount = 0;
-        this.set('updateUrl', (val) => {
-            changeActionCallCount += 1;
-            return val;
-        });
-
-        await render(hbs `
-            <Settings::Navigation::NavItemUrlInput @baseUrl={{this.baseUrl}} @url={{this.url}} @isNew={{this.isNew}} @update={{this.updateUrl}} @clearErrors={{this.clearErrors}} />
-        `);
-        await triggerKeyEvent('input', 'keypress', 13);
-
-        expect(changeActionCallCount).to.equal(1);
-    });
-
-    it('triggers "update" action on CMD-S', async function () {
-        let changeActionCallCount = 0;
-        this.set('updateUrl', (val) => {
-            changeActionCallCount += 1;
-            return val;
-        });
-
-        await render(hbs `
-            <Settings::Navigation::NavItemUrlInput @baseUrl={{this.baseUrl}} @url={{this.url}} @isNew={{this.isNew}} @update={{this.updateUrl}} @clearErrors={{this.clearErrors}} />
-        `);
-        await triggerKeyEvent('input', 'keydown', 83, {
-            metaKey: true
-        });
-
-        expect(changeActionCallCount).to.equal(1);
-    });
-
-    it('sends absolute urls straight through to update action', async function () {
-        let lastSeenUrl = '';
-
-        this.set('updateUrl', (url) => {
-            lastSeenUrl = url;
-            return url;
-        });
-
-        await render(hbs `
-            <Settings::Navigation::NavItemUrlInput @baseUrl={{this.baseUrl}} @url={{this.url}} @isNew={{this.isNew}} @update={{this.updateUrl}} @clearErrors={{this.clearErrors}} />
-        `);
-
-        let testUrl = async (url) => {
-            await fillIn('input', url);
-            await blur('input');
-            expect(lastSeenUrl).to.equal(url);
-        };
-
-        await testUrl('http://example.com');
-        await testUrl('http://example.com/');
-        await testUrl('https://example.com');
-        await testUrl('//example.com');
-        await testUrl('//localhost:1234');
-        await testUrl('#anchor');
-        await testUrl('mailto:test@example.com');
-        await testUrl('tel:12345-567890');
-        await testUrl('javascript:alert("testing");');
-    });
-
-    it('strips base url from relative urls before sending to update action', async function () {
-        let lastSeenUrl = '';
-
-        this.set('updateUrl', (url) => {
-            lastSeenUrl = url;
-            return url;
-        });
-
-        await render(hbs `
-            <Settings::Navigation::NavItemUrlInput @baseUrl={{this.baseUrl}} @url={{this.url}} @isNew={{this.isNew}} @update={{this.updateUrl}} @clearErrors={{this.clearErrors}} />
-        `);
-
-        let testUrl = async (url) => {
-            await fillIn('input', `${currentUrl}${url}`);
-            await blur('input');
-            expect(lastSeenUrl).to.equal(`/${url}`);
-        };
-
-        await testUrl('about/');
-        await testUrl('about#contact');
-        await testUrl('test/nested/');
-    });
-
-    it('handles links to subdomains of blog domain', async function () {
-        let expectedUrl = '';
-
-        this.set('baseUrl', 'http://example.com/');
-
-        this.set('updateUrl', (url) => {
-            expect(url).to.equal(expectedUrl);
-            return url;
-        });
-
-        await render(hbs `
-            <Settings::Navigation::NavItemUrlInput @baseUrl={{this.baseUrl}} @url={{this.url}} @isNew={{this.isNew}} @update={{this.updateUrl}} @clearErrors={{this.clearErrors}} />
-        `);
-
-        expectedUrl = 'http://test.example.com/';
-        await fillIn('input', expectedUrl);
-        await blur('input');
-        expect(find('input')).to.have.value(expectedUrl);
-    });
-
-    it('adds trailing slash to relative URL', async function () {
-        let lastSeenUrl = '';
-
-        this.set('updateUrl', (url) => {
-            lastSeenUrl = url;
-            return url;
-        });
-
-        await render(hbs `
-            <Settings::Navigation::NavItemUrlInput @baseUrl={{this.baseUrl}} @url={{this.url}} @isNew={{this.isNew}} @update={{this.updateUrl}} @clearErrors={{this.clearErrors}} />
-        `);
-
-        let testUrl = async (url) => {
-            await fillIn('input', `${currentUrl}${url}`);
-            await blur('input');
-            expect(lastSeenUrl).to.equal(`/${url}/`);
-        };
-
-        await testUrl('about');
-        await testUrl('test/nested');
-    });
-
-    it('does not add trailing slash on relative URL with [.?#]', async function () {
-        let lastSeenUrl = '';
-
-        this.set('updateUrl', (url) => {
-            lastSeenUrl = url;
-            return url;
-        });
-
-        await render(hbs `
-            <Settings::Navigation::NavItemUrlInput @baseUrl={{this.baseUrl}} @url={{this.url}} @isNew={{this.isNew}} @update={{this.updateUrl}} @clearErrors={{this.clearErrors}} />
-        `);
-
-        let testUrl = async (url) => {
-            await fillIn('input', `${currentUrl}${url}`);
-            await blur('input');
-            expect(lastSeenUrl).to.equal(`/${url}`);
-        };
-
-        await testUrl('about#contact');
-        await testUrl('test/nested.svg');
-        await testUrl('test?gho=sties');
-        await testUrl('test/nested?sli=mer');
-    });
-
-    it('does not add trailing slash on non-relative URLs', async function () {
-        let lastSeenUrl = '';
-
-        this.set('updateUrl', (url) => {
-            lastSeenUrl = url;
-            return url;
-        });
-
-        await render(hbs `
-            <Settings::Navigation::NavItemUrlInput @baseUrl={{this.baseUrl}} @url={{this.url}} @isNew={{this.isNew}} @update={{this.updateUrl}} @clearErrors={{this.clearErrors}} />
-        `);
-
-        let testUrl = async (url) => {
-            await fillIn('input', url);
-            await blur('input');
-            expect(lastSeenUrl).to.equal(url);
-        };
-
-        await testUrl('http://woo.ff/test');
-        await testUrl('http://me.ow:2342/nested/test');
-        await testUrl('https://wro.om/car#race');
-        await testUrl('https://kabo.om/explosion?really=now');
-    });
-
-    describe('with sub-folder baseUrl', function () {
-        beforeEach(function () {
-            this.set('baseUrl', `${currentUrl}blog/`);
-        });
-
-        it('handles URLs relative to base url', async function () {
-            let lastSeenUrl = '';
-
-            this.set('updateUrl', (url) => {
-                lastSeenUrl = url;
-                return url;
-            });
-
-            await render(hbs `
-                <Settings::Navigation::NavItemUrlInput @baseUrl={{this.baseUrl}} @url={{this.url}} @isNew={{this.isNew}} @update={{this.updateUrl}} @clearErrors={{this.clearErrors}} />
-            `);
-
-            let testUrl = async (url) => {
-                await fillIn('input', `${currentUrl}blog${url}`);
-                await blur('input');
-                expect(lastSeenUrl).to.equal(url);
-            };
-
-            await testUrl('/about/');
-            await testUrl('/about#contact');
-            await testUrl('/test/nested/');
-        });
-
-        it('handles URLs relative to base host', async function () {
-            let lastSeenUrl = '';
-
-            this.set('updateUrl', (url) => {
-                lastSeenUrl = url;
-                return url;
-            });
-
-            await render(hbs `
-                <Settings::Navigation::NavItemUrlInput @baseUrl={{this.baseUrl}} @url={{this.url}} @isNew={{this.isNew}} @update={{this.updateUrl}} @clearErrors={{this.clearErrors}} />
-            `);
-
-            let testUrl = async (url) => {
-                await fillIn('input', url);
-                await blur('input');
-                expect(lastSeenUrl).to.equal(url);
-            };
-
-            await testUrl(`http://${window.location.host}`);
-            await testUrl(`https://${window.location.host}`);
-            await testUrl(`http://${window.location.host}/`);
-            await testUrl(`https://${window.location.host}/`);
-            await testUrl(`http://${window.location.host}/test`);
-            await testUrl(`https://${window.location.host}/test`);
-            await testUrl(`http://${window.location.host}/#test`);
-            await testUrl(`https://${window.location.host}/#test`);
-            await testUrl(`http://${window.location.host}/another/folder`);
-            await testUrl(`https://${window.location.host}/another/folder`);
-        });
-    });
-});
diff --git a/ghost/admin/tests/unit/controllers/settings/design-test.js b/ghost/admin/tests/unit/controllers/settings/design-test.js
deleted file mode 100644
index 543a0a2ac42..00000000000
--- a/ghost/admin/tests/unit/controllers/settings/design-test.js
+++ /dev/null
@@ -1,159 +0,0 @@
-import EmberObject from '@ember/object';
-import NavItem from 'ghost-admin/models/navigation-item';
-import {assert, expect} from 'chai';
-import {describe, it} from 'mocha';
-import {run} from '@ember/runloop';
-import {setupTest} from 'ember-mocha';
-
-// const navSettingJSON = `[
-//     {"label":"Home","url":"/"},
-//     {"label":"JS Test","url":"javascript:alert('hello');"},
-//     {"label":"About","url":"/about"},
-//     {"label":"Sub Folder","url":"/blah/blah"},
-//     {"label":"Telephone","url":"tel:01234-567890"},
-//     {"label":"Mailto","url":"mailto:test@example.com"},
-//     {"label":"External","url":"https://example.com/testing?query=test#anchor"},
-//     {"label":"No Protocol","url":"//example.com"}
-// ]`;
-
-describe.skip('Unit: Controller: settings/design', function () {
-    setupTest();
-
-    it('blogUrl: captures config and ensures trailing slash', function () {
-        let ctrl = this.owner.lookup('controller:settings/design');
-        ctrl.set('config.blogUrl', 'http://localhost:2368/blog');
-        expect(ctrl.get('blogUrl')).to.equal('http://localhost:2368/blog/');
-    });
-
-    it('init: creates a new navigation item', function () {
-        let ctrl = this.owner.lookup('controller:settings/design');
-
-        run(() => {
-            expect(ctrl.get('newNavItem')).to.exist;
-            expect(ctrl.get('newNavItem.isNew')).to.be.true;
-        });
-    });
-
-    it('blogUrl: captures config and ensures trailing slash', function () {
-        let ctrl = this.owner.lookup('controller:settings/design');
-        ctrl.set('config.blogUrl', 'http://localhost:2368/blog');
-        expect(ctrl.get('blogUrl')).to.equal('http://localhost:2368/blog/');
-    });
-
-    it('save: validates nav items', function (done) {
-        let ctrl = this.owner.lookup('controller:settings/design');
-
-        run(() => {
-            ctrl.set('settings', EmberObject.create({navigation: [
-                NavItem.create({label: 'First', url: '/'}),
-                NavItem.create({label: '', url: '/second'}),
-                NavItem.create({label: 'Third', url: ''})
-            ]}));
-            // blank item won't get added because the last item is incomplete
-            expect(ctrl.settings.navigation.length).to.equal(3);
-
-            ctrl.get('save').perform().then(function passedValidation() {
-                assert(false, 'navigationItems weren\'t validated on save');
-                done();
-            }).catch(function failedValidation() {
-                let navItems = ctrl.settings.navigation;
-                expect(navItems[0].get('errors').toArray()).to.be.empty;
-                expect(navItems[1].get('errors.firstObject.attribute')).to.equal('label');
-                expect(navItems[2].get('errors.firstObject.attribute')).to.equal('url');
-                done();
-            });
-        });
-    });
-
-    it('save: ignores blank last item when saving', function (done) {
-        let ctrl = this.owner.lookup('controller:settings/design');
-
-        run(() => {
-            ctrl.set('settings', EmberObject.create({navigation: [
-                NavItem.create({label: 'First', url: '/'}),
-                NavItem.create({label: '', url: ''})
-            ]}));
-
-            expect(ctrl.settings.navigation.length).to.equal(2);
-
-            ctrl.get('save').perform().then(function passedValidation() {
-                assert(false, 'navigationItems weren\'t validated on save');
-                done();
-            }).catch(function failedValidation() {
-                let navItems = ctrl.settings.navigation;
-                expect(navItems[0].get('errors').toArray()).to.be.empty;
-                done();
-            });
-        });
-    });
-
-    it('action - addNavItem: adds item to navigationItems', function () {
-        let ctrl = this.owner.lookup('controller:settings/design');
-
-        run(() => {
-            ctrl.set('settings', EmberObject.create({navigation: [
-                NavItem.create({label: 'First', url: '/first', last: true})
-            ]}));
-        });
-
-        expect(ctrl.settings.navigation.length).to.equal(1);
-
-        ctrl.set('newNavItem.label', 'New');
-        ctrl.set('newNavItem.url', '/new');
-
-        run(() => {
-            ctrl.send('addNavItem', ctrl.get('newNavItem'));
-        });
-
-        expect(ctrl.settings.navigation.length).to.equal(2);
-        expect(ctrl.settings.navigation.lastObject.label).to.equal('New');
-        expect(ctrl.settings.navigation.lastObject.url).to.equal('/new');
-        expect(ctrl.settings.navigation.lastObject.isNew).to.be.false;
-        expect(ctrl.get('newNavItem.label')).to.be.empty;
-        expect(ctrl.get('newNavItem.url')).to.be.empty;
-        expect(ctrl.get('newNavItem.isNew')).to.be.true;
-    });
-
-    it('action - addNavItem: doesn\'t insert new item if last object is incomplete', function () {
-        let ctrl = this.owner.lookup('controller:settings/design');
-
-        run(() => {
-            ctrl.set('settings', EmberObject.create({navigation: [
-                NavItem.create({label: '', url: '', last: true})
-            ]}));
-            expect(ctrl.settings.navigation.length).to.equal(1);
-            ctrl.send('addNavItem', ctrl.settings.navigation.lastObject);
-            expect(ctrl.settings.navigation.length).to.equal(1);
-        });
-    });
-
-    it('action - deleteNavItem: removes item from navigationItems', function () {
-        let ctrl = this.owner.lookup('controller:settings/design');
-        let navItems = [
-            NavItem.create({label: 'First', url: '/first'}),
-            NavItem.create({label: 'Second', url: '/second', last: true})
-        ];
-
-        run(() => {
-            ctrl.set('settings', EmberObject.create({navigation: navItems}));
-            expect(ctrl.settings.navigation.mapBy('label')).to.deep.equal(['First', 'Second']);
-            ctrl.send('deleteNavItem', ctrl.settings.navigation.firstObject);
-            expect(ctrl.settings.navigation.mapBy('label')).to.deep.equal(['Second']);
-        });
-    });
-
-    it('action - updateUrl: updates URL on navigationItem', function () {
-        let ctrl = this.owner.lookup('controller:settings/design');
-        let navItems = [
-            NavItem.create({label: 'First', url: '/first'}),
-            NavItem.create({label: 'Second', url: '/second', last: true})
-        ];
-
-        run(() => {
-            ctrl.set('settings', EmberObject.create({navigation: navItems}));
-            expect(ctrl.settings.navigation.mapBy('url')).to.deep.equal(['/first', '/second']);
-            ctrl.send('updateUrl', '/new', ctrl.settings.navigation.firstObject);
-            expect(ctrl.settings.navigation.mapBy('url')).to.deep.equal(['/new', '/second']);
-        });
-    });
-});
diff --git a/ghost/api-framework/package.json b/ghost/api-framework/package.json
index 6c0e5ce0963..0310d0ca8ff 100644
--- a/ghost/api-framework/package.json
+++ b/ghost/api-framework/package.json
@@ -24,11 +24,11 @@
     "sinon": "15.2.0"
   },
   "dependencies": {
-    "@tryghost/debug": "0.1.24",
+    "@tryghost/debug": "0.1.26",
     "@tryghost/errors": "1.2.26",
-    "@tryghost/promise": "0.3.4",
-    "@tryghost/tpl": "0.1.24",
-    "@tryghost/validator": "0.2.4",
+    "@tryghost/promise": "0.3.6",
+    "@tryghost/tpl": "0.1.26",
+    "@tryghost/validator": "0.2.6",
     "jsonpath": "1.1.1",
     "lodash": "4.17.21"
   }
diff --git a/ghost/audience-feedback/package.json b/ghost/audience-feedback/package.json
index 1b4569ba923..499c563f25e 100644
--- a/ghost/audience-feedback/package.json
+++ b/ghost/audience-feedback/package.json
@@ -25,7 +25,7 @@
   },
   "dependencies": {
     "@tryghost/errors": "1.2.26",
-    "@tryghost/tpl": "0.1.24",
+    "@tryghost/tpl": "0.1.26",
     "bson-objectid": "2.0.4"
   }
 }
diff --git a/ghost/collections/package.json b/ghost/collections/package.json
index fd2d825e72f..04596d0940b 100644
--- a/ghost/collections/package.json
+++ b/ghost/collections/package.json
@@ -33,7 +33,7 @@
         "@tryghost/nql": "0.11.0",
         "@tryghost/nql-filter-expansions": "0.0.0",
         "@tryghost/post-events": "0.0.0",
-        "@tryghost/tpl": "0.1.25",
+        "@tryghost/tpl": "0.1.26",
         "bson-objectid": "2.0.4",
         "lodash": "4.17.21"
     },
diff --git a/ghost/core/content/themes/source b/ghost/core/content/themes/source
index ea08ce4e9dd..946e0631178 160000
--- a/ghost/core/content/themes/source
+++ b/ghost/core/content/themes/source
@@ -1 +1 @@
-Subproject commit ea08ce4e9dd6f67cdaae216bcc5b55a6490efc1d
+Subproject commit 946e06311787f864cd347678fb9012f6d3abab22
diff --git a/ghost/core/core/frontend/apps/private-blogging/lib/views/private.hbs b/ghost/core/core/frontend/apps/private-blogging/lib/views/private.hbs
index 87670059fbb..4d662e50aab 100644
--- a/ghost/core/core/frontend/apps/private-blogging/lib/views/private.hbs
+++ b/ghost/core/core/frontend/apps/private-blogging/lib/views/private.hbs
@@ -5,8 +5,35 @@
         <meta http-equiv="Content-Type" content="text/html" charset="UTF-8" />
         <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
 
-        <title>{{@site.title}} - Private Site Access</title>
+        <title>{{@site.title}}</title>
+        <meta property="og:type" content="website">
+        <meta property="og:site_name" content="{{@site.title}}">
+        <meta property="og:title" content="{{@site.title}}">
+        <meta name="twitter:title" content="{{@site.title}}">
 
+        <link rel="canonical" href="{{@site.url}}">
+        <meta property="og:url" content="{{@site.url}}">
+        <meta name="twitter:url" content="{{@site.url}}">
+
+        {{#if @site.icon}}
+            <link rel="icon" href="{{img_url @site.icon absolute="true"}}" type="image/png">
+        {{/if}}
+
+        {{#if @site.description}}
+            <meta name="description" content="{{@site.description}}">
+            <meta property="og:description" content="{{@site.description}}">
+            <meta name="twitter:description" content="{{@site.description}}">
+        {{/if}}
+
+        {{#if @site.cover_image}}
+            <meta property="og:image" content="{{img_url @site.cover_image absolute="true"}}">
+            <meta name="twitter:image" content="{{img_url @site.cover_image absolute="true"}}">
+        {{/if}}
+
+        <meta name="twitter:card" content="summary_large_image">
+        <meta name="twitter:site" content="@ghost">
+        <meta property="article:publisher" content="https://www.facebook.com/ghost">
+        <meta name="referrer" content="no-referrer-when-downgrade">
         <meta name="HandheldFriendly" content="True">
         <meta name="MobileOptimized" content="320">
         <meta name="viewport" content="user-scalable=no, width=device-width, initial-scale=1, maximum-scale=1">
diff --git a/ghost/core/core/frontend/web/middleware/static-theme.js b/ghost/core/core/frontend/web/middleware/static-theme.js
index e2a6d393faf..e3d5af00e7a 100644
--- a/ghost/core/core/frontend/web/middleware/static-theme.js
+++ b/ghost/core/core/frontend/web/middleware/static-theme.js
@@ -45,7 +45,7 @@ function isAllowedFile(file) {
 
     const normalizedFilePath = path.normalize(decodedFilePath);
 
-    const allowedFiles = ['manifest.json'];
+    const allowedFiles = ['manifest.json', 'assetlinks.json'];
     const allowedPath = '/assets/';
     const alwaysDeny = ['.hbs'];
 
diff --git a/ghost/core/core/server/api/endpoints/recommendations.js b/ghost/core/core/server/api/endpoints/recommendations.js
index 368156f1200..afad5b4d658 100644
--- a/ghost/core/core/server/api/endpoints/recommendations.js
+++ b/ghost/core/core/server/api/endpoints/recommendations.js
@@ -48,6 +48,24 @@ module.exports = {
         }
     },
 
+    /**
+     * Fetch metadata for a recommendation URL
+     */
+    check: {
+        headers: {
+            cacheInvalidate: true
+        },
+        options: [],
+        validation: {},
+        permissions: {
+            // Everyone who has add permissions, can 'check'
+            method: 'add'
+        },
+        async query(frame) {
+            return await recommendations.controller.check(frame);
+        }
+    },
+
     edit: {
         headers: {
             cacheInvalidate: true
diff --git a/ghost/core/core/server/api/endpoints/utils/serializers/input/pages.js b/ghost/core/core/server/api/endpoints/utils/serializers/input/pages.js
index b14f7dcda12..06b4681e695 100644
--- a/ghost/core/core/server/api/endpoints/utils/serializers/input/pages.js
+++ b/ghost/core/core/server/api/endpoints/utils/serializers/input/pages.js
@@ -133,11 +133,23 @@ module.exports = {
             const html = frame.data.pages[0].html;
 
             if (frame.options.source === 'html' && !_.isEmpty(html)) {
+                if (process.env.CI) {
+                    console.time('htmlToMobiledocConverter (page)'); // eslint-disable-line no-console
+                }
                 frame.data.pages[0].mobiledoc = JSON.stringify(mobiledoc.htmlToMobiledocConverter(html));
+                if (process.env.CI) {
+                    console.timeEnd('htmlToMobiledocConverter (page)'); // eslint-disable-line no-console
+                }
 
                 // normally we don't allow both mobiledoc+lexical but the model layer will remove lexical
                 // if mobiledoc is already present to avoid migrating formats outside of an explicit conversion
+                if (process.env.CI) {
+                    console.time('htmlToLexicalConverter (page)'); // eslint-disable-line no-console
+                }
                 frame.data.pages[0].lexical = JSON.stringify(lexical.htmlToLexicalConverter(html));
+                if (process.env.CI) {
+                    console.timeEnd('htmlToLexicalConverter (page)'); // eslint-disable-line no-console
+                }
             }
         }
 
diff --git a/ghost/core/core/server/api/endpoints/utils/serializers/input/posts.js b/ghost/core/core/server/api/endpoints/utils/serializers/input/posts.js
index ff761f36e71..faf968afff6 100644
--- a/ghost/core/core/server/api/endpoints/utils/serializers/input/posts.js
+++ b/ghost/core/core/server/api/endpoints/utils/serializers/input/posts.js
@@ -167,11 +167,23 @@ module.exports = {
             const html = frame.data.posts[0].html;
 
             if (frame.options.source === 'html' && !_.isEmpty(html)) {
+                if (process.env.CI) {
+                    console.time('htmlToMobiledocConverter (post)'); // eslint-disable-line no-console
+                }
                 frame.data.posts[0].mobiledoc = JSON.stringify(mobiledoc.htmlToMobiledocConverter(html));
+                if (process.env.CI) {
+                    console.timeEnd('htmlToMobiledocConverter (post)'); // eslint-disable-line no-console
+                }
 
                 // normally we don't allow both mobiledoc+lexical but the model layer will remove lexical
                 // if mobiledoc is already present to avoid migrating formats outside of an explicit conversion
+                if (process.env.CI) {
+                    console.time('htmlToLexicalConverter (post)'); // eslint-disable-line no-console
+                }
                 frame.data.posts[0].lexical = JSON.stringify(lexical.htmlToLexicalConverter(html));
+                if (process.env.CI) {
+                    console.timeEnd('htmlToLexicalConverter (post)'); // eslint-disable-line no-console
+                }
             }
         }
 
diff --git a/ghost/core/core/server/api/endpoints/utils/serializers/output/mappers/posts.js b/ghost/core/core/server/api/endpoints/utils/serializers/output/mappers/posts.js
index 14bedfe60f0..5db08da6223 100644
--- a/ghost/core/core/server/api/endpoints/utils/serializers/output/mappers/posts.js
+++ b/ghost/core/core/server/api/endpoints/utils/serializers/output/mappers/posts.js
@@ -77,6 +77,7 @@ module.exports = async (model, frame, options = {}) => {
     if (utils.isContentAPI(frame)) {
         date.forPost(jsonModel);
         gating.forPost(jsonModel, frame);
+
         if (jsonModel.access) {
             if (commentsService?.api?.enabled !== 'off') {
                 jsonModel.comments = true;
@@ -87,6 +88,10 @@ module.exports = async (model, frame, options = {}) => {
             jsonModel.comments = false;
         }
 
+        // Strip any source formats
+        delete jsonModel.mobiledoc;
+        delete jsonModel.lexical;
+
         // Add  outbound link tags
         if (labs.isSet('outboundLinkTagging')) {
             // Only add it in the flag! Without the flag we only add it to emails.
diff --git a/ghost/core/core/server/data/migrations/utils/schema.js b/ghost/core/core/server/data/migrations/utils/schema.js
index 5dee3f7bdf2..d72215749af 100644
--- a/ghost/core/core/server/data/migrations/utils/schema.js
+++ b/ghost/core/core/server/data/migrations/utils/schema.js
@@ -96,6 +96,22 @@ function createSetNullableMigration(table, column, options = {}) {
     );
 }
 
+/**
+ * @param {string} table
+ * @param {string[]|string} columns One or multiple columns (in case the index should be for multiple columns)
+ * @returns {Migration}
+ */
+function createAddIndexMigration(table, columns) {
+    return createTransactionalMigration(
+        async function up(knex) {
+            await commands.addIndex(table, columns, knex);
+        },
+        async function down(knex) {
+            await commands.dropIndex(table, columns, knex);
+        }
+    );
+}
+
 /**
  * @param {string} table
  * @param {string} from
@@ -163,7 +179,8 @@ module.exports = {
     createDropColumnMigration,
     createSetNullableMigration,
     createDropNullableMigration,
-    createRenameColumnMigration
+    createRenameColumnMigration,
+    createAddIndexMigration
 };
 
 /**
diff --git a/ghost/core/core/server/data/migrations/versions/5.72/2023-10-31-11-06-00-members-created-attribution-id-index.js b/ghost/core/core/server/data/migrations/versions/5.72/2023-10-31-11-06-00-members-created-attribution-id-index.js
new file mode 100644
index 00000000000..9bcbb4cc0b3
--- /dev/null
+++ b/ghost/core/core/server/data/migrations/versions/5.72/2023-10-31-11-06-00-members-created-attribution-id-index.js
@@ -0,0 +1,3 @@
+const {createAddIndexMigration} = require('../../utils');
+
+module.exports = createAddIndexMigration('members_created_events', ['attribution_id']);
diff --git a/ghost/core/core/server/data/migrations/versions/5.72/2023-10-31-11-06-01-members-subscription-created-attribution-id-index.js b/ghost/core/core/server/data/migrations/versions/5.72/2023-10-31-11-06-01-members-subscription-created-attribution-id-index.js
new file mode 100644
index 00000000000..346ea18886e
--- /dev/null
+++ b/ghost/core/core/server/data/migrations/versions/5.72/2023-10-31-11-06-01-members-subscription-created-attribution-id-index.js
@@ -0,0 +1,3 @@
+const {createAddIndexMigration} = require('../../utils');
+
+module.exports = createAddIndexMigration('members_subscription_created_events', ['attribution_id']);
diff --git a/ghost/core/core/server/data/schema/commands.js b/ghost/core/core/server/data/schema/commands.js
index c8b804dc93f..252225082df 100644
--- a/ghost/core/core/server/data/schema/commands.js
+++ b/ghost/core/core/server/data/schema/commands.js
@@ -175,6 +175,60 @@ async function renameColumn(tableName, from, to, transaction = db.knex) {
     });
 }
 
+/**
+ * Adds an non-unique index to a table over the given columns.
+ *
+ * @param {string} tableName - name of the table to add indexes to
+ * @param {string|string[]} columns - column(s) to add indexes for
+ * @param {import('knex').Knex} [transaction] - connection object containing knex reference
+ */
+async function addIndex(tableName, columns, transaction = db.knex) {
+    try {
+        logging.info(`Adding index for '${columns}' in table '${tableName}'`);
+
+        return await transaction.schema.table(tableName, function (table) {
+            table.index(columns);
+        });
+    } catch (err) {
+        if (err.code === 'SQLITE_ERROR') {
+            logging.warn(`Index for '${columns}' already exists for table '${tableName}'`);
+            return;
+        }
+        if (err.code === 'ER_DUP_KEYNAME') {
+            logging.warn(`Index for '${columns}' already exists for table '${tableName}'`);
+            return;
+        }
+        throw err;
+    }
+}
+
+/**
+ * Drops a non-unique index from a table over the given columns.
+ *
+ * @param {string} tableName - name of the table to remove indexes from
+ * @param {string|string[]} columns - column(s) to remove indexes for
+ * @param {import('knex').Knex} [transaction] - connection object containing knex reference
+ */
+async function dropIndex(tableName, columns, transaction = db.knex) {
+    try {
+        logging.info(`Dropping index for '${columns}' in table '${tableName}'`);
+
+        return await transaction.schema.table(tableName, function (table) {
+            table.dropIndex(columns);
+        });
+    } catch (err) {
+        if (err.code === 'SQLITE_ERROR') {
+            logging.warn(`Constraint for '${columns}' does not exist for table '${tableName}'`);
+            return;
+        }
+        if (err.code === 'ER_CANT_DROP_FIELD_OR_KEY') {
+            logging.warn(`Constraint for '${columns}' does not exist for table '${tableName}'`);
+            return;
+        }
+        throw err;
+    }
+}
+
 /**
  * Adds an unique index to a table over the given columns.
  *
@@ -535,6 +589,8 @@ module.exports = {
     getIndexes,
     addUnique,
     dropUnique,
+    addIndex,
+    dropIndex,
     addPrimaryKey,
     addForeign,
     dropForeign,
diff --git a/ghost/core/core/server/data/schema/schema.js b/ghost/core/core/server/data/schema/schema.js
index 29a748ecacc..2fbe4699732 100644
--- a/ghost/core/core/server/data/schema/schema.js
+++ b/ghost/core/core/server/data/schema/schema.js
@@ -523,7 +523,7 @@ module.exports = {
         id: {type: 'string', maxlength: 24, nullable: false, primary: true},
         created_at: {type: 'dateTime', nullable: false},
         member_id: {type: 'string', maxlength: 24, nullable: false, references: 'members.id', cascadeDelete: true},
-        attribution_id: {type: 'string', maxlength: 24, nullable: true},
+        attribution_id: {type: 'string', maxlength: 24, nullable: true, index: true},
         attribution_type: {
             type: 'string', maxlength: 50, nullable: true, validations: {
                 isIn: [['url', 'post', 'page', 'author', 'tag']]
@@ -709,7 +709,7 @@ module.exports = {
         created_at: {type: 'dateTime', nullable: false},
         member_id: {type: 'string', maxlength: 24, nullable: false, references: 'members.id', cascadeDelete: true},
         subscription_id: {type: 'string', maxlength: 24, nullable: false, references: 'members_stripe_customers_subscriptions.id', cascadeDelete: true},
-        attribution_id: {type: 'string', maxlength: 24, nullable: true},
+        attribution_id: {type: 'string', maxlength: 24, nullable: true, index: true},
         attribution_type: {
             type: 'string', maxlength: 50, nullable: true, validations: {
                 isIn: [['url', 'post', 'page', 'author', 'tag']]
diff --git a/ghost/core/core/server/lib/lexical.js b/ghost/core/core/server/lib/lexical.js
index 7fd5730efe1..8363e51aa4f 100644
--- a/ghost/core/core/server/lib/lexical.js
+++ b/ghost/core/core/server/lib/lexical.js
@@ -143,7 +143,17 @@ module.exports = {
 
     get htmlToLexicalConverter() {
         try {
-            return require('@tryghost/kg-html-to-lexical').htmlToLexical;
+            if (process.env.CI) {
+                console.time('require @tryghost/kg-html-to-lexical'); // eslint-disable-line no-console
+            }
+
+            const htmlToLexical = require('@tryghost/kg-html-to-lexical').htmlToLexical;
+
+            if (process.env.CI) {
+                console.timeEnd('require @tryghost/kg-html-to-lexical'); // eslint-disable-line no-console
+            }
+
+            return htmlToLexical;
         } catch (err) {
             throw new errors.InternalServerError({
                 message: 'Unable to convert from source HTML to Lexical',
diff --git a/ghost/core/core/server/lib/mobiledoc.js b/ghost/core/core/server/lib/mobiledoc.js
index 790210966f9..20fc01c8e32 100644
--- a/ghost/core/core/server/lib/mobiledoc.js
+++ b/ghost/core/core/server/lib/mobiledoc.js
@@ -75,7 +75,17 @@ module.exports = {
 
     get htmlToMobiledocConverter() {
         try {
-            return require('@tryghost/html-to-mobiledoc').toMobiledoc;
+            if (process.env.CI) {
+                console.time('require @tryghost/html-to-mobiledoc'); // eslint-disable-line no-console
+            }
+
+            const toMobiledoc = require('@tryghost/html-to-mobiledoc').toMobiledoc;
+
+            if (process.env.CI) {
+                console.timeEnd('require @tryghost/html-to-mobiledoc'); // eslint-disable-line no-console
+            }
+
+            return toMobiledoc;
         } catch (err) {
             return () => {
                 throw new errors.InternalServerError({
diff --git a/ghost/core/core/server/services/custom-redirects/CustomRedirectsAPI.js b/ghost/core/core/server/services/custom-redirects/CustomRedirectsAPI.js
index 5241f35d90b..54a54c6fdde 100644
--- a/ghost/core/core/server/services/custom-redirects/CustomRedirectsAPI.js
+++ b/ghost/core/core/server/services/custom-redirects/CustomRedirectsAPI.js
@@ -9,7 +9,7 @@ const errors = require('@tryghost/errors');
 const messages = {
     jsonParse: 'Could not parse JSON: {context}.',
     yamlParse: 'Could not parse YAML: {context}.',
-    yamlPlainString: 'YAML input cannot be a plain string. Check the format of your YAML file.',
+    yamlInvalid: 'YAML input is invalid. Check the contents of your YAML file.',
     redirectsHelp: 'https://ghost.org/docs/themes/routing/#redirects',
     redirectsRegister: 'Could not register custom redirects.'
 };
@@ -78,13 +78,9 @@ const parseRedirectsFile = (content, ext) => {
             });
         }
 
-        // yaml.load passes almost every yaml code.
-        // Because of that, it's hard to detect if there's an error in the file.
-        // But one of the obvious errors is the plain string output.
-        // Here we check if the user made this mistake.
-        if (typeof configYaml === 'string') {
+        if (typeof configYaml !== 'object' || configYaml === null) {
             throw new errors.BadRequestError({
-                message: tpl(messages.yamlPlainString),
+                message: tpl(messages.yamlInvalid),
                 help: tpl(messages.redirectsHelp)
             });
         }
diff --git a/ghost/core/core/server/services/members/MembersConfigProvider.js b/ghost/core/core/server/services/members/MembersConfigProvider.js
index 560eb576f03..7d592e36526 100644
--- a/ghost/core/core/server/services/members/MembersConfigProvider.js
+++ b/ghost/core/core/server/services/members/MembersConfigProvider.js
@@ -35,10 +35,6 @@ class MembersConfigProvider {
         return this._settingsHelpers.getMembersSupportAddress();
     }
 
-    getAuthEmailFromAddress() {
-        return this.getEmailSupportAddress();
-    }
-
     /**
      * @deprecated Use settingsHelpers.isStripeConnected instead
      */
diff --git a/ghost/core/core/server/services/members/api.js b/ghost/core/core/server/services/members/api.js
index 69a8b989975..21d6318a536 100644
--- a/ghost/core/core/server/services/members/api.js
+++ b/ghost/core/core/server/services/members/api.js
@@ -47,7 +47,7 @@ function createApiInstance(config) {
                         logging.warn(message.text);
                     }
                     let msg = Object.assign({
-                        from: config.getAuthEmailFromAddress(),
+                        from: config.getEmailSupportAddress(),
                         subject: 'Signin',
                         forceTextContent: true
                     }, message);
diff --git a/ghost/core/core/server/services/members/middleware.js b/ghost/core/core/server/services/members/middleware.js
index 23451c2ecdc..a3ad49a4fb9 100644
--- a/ghost/core/core/server/services/members/middleware.js
+++ b/ghost/core/core/server/services/members/middleware.js
@@ -265,8 +265,16 @@ const createSessionFromMagicLink = async function createSessionFromMagicLink(req
                 const ensureEndsWith = (string, endsWith) => (string.endsWith(endsWith) ? string : string + endsWith);
                 const removeLeadingSlash = string => string.replace(/^\//, '');
 
+                // Add query parameters so the frontend can detect that the signup went fine
+
                 const redirectUrl = new URL(removeLeadingSlash(ensureEndsWith(customRedirect, '/')), ensureEndsWith(baseUrl, '/'));
 
+                if (urlUtils.isSiteUrl(redirectUrl)) {
+                    // Add only for non-external URLs
+                    redirectUrl.searchParams.set('success', 'true');
+                    redirectUrl.searchParams.set('action', 'signup');
+                }
+
                 return res.redirect(redirectUrl.href);
             }
         }
diff --git a/ghost/core/core/server/services/members/utils.js b/ghost/core/core/server/services/members/utils.js
index 4d9140402ea..0b6113c96ae 100644
--- a/ghost/core/core/server/services/members/utils.js
+++ b/ghost/core/core/server/services/members/utils.js
@@ -1,6 +1,12 @@
 function formatNewsletterResponse(newsletters) {
-    return newsletters.map(({id, name, description, sort_order: sortOrder}) => {
-        return {id, name, description, sort_order: sortOrder};
+    return newsletters.map(({id, uuid, name, description, sort_order: sortOrder}) => {
+        return {
+            id,
+            uuid,
+            name,
+            description,
+            sort_order: sortOrder
+        };
     });
 }
 
diff --git a/ghost/core/core/server/services/recommendations/RecommendationServiceWrapper.js b/ghost/core/core/server/services/recommendations/RecommendationServiceWrapper.js
index 6c00e54dc8d..dd9bf714a65 100644
--- a/ghost/core/core/server/services/recommendations/RecommendationServiceWrapper.js
+++ b/ghost/core/core/server/services/recommendations/RecommendationServiceWrapper.js
@@ -50,6 +50,7 @@ class RecommendationServiceWrapper {
         const sentry = require('../../../shared/sentry');
         const settings = require('../settings');
         const RecommendationEnablerService = require('./RecommendationEnablerService');
+
         const {
             BookshelfRecommendationRepository,
             RecommendationService,
@@ -58,7 +59,8 @@ class RecommendationServiceWrapper {
             BookshelfClickEventRepository,
             IncomingRecommendationController,
             IncomingRecommendationService,
-            IncomingRecommendationEmailRenderer
+            IncomingRecommendationEmailRenderer,
+            RecommendationMetadataService
         } = require('@tryghost/recommendations');
 
         const mentions = require('../mentions');
@@ -87,13 +89,22 @@ class RecommendationServiceWrapper {
             sentry
         });
 
+        const oembedService = require('../oembed');
+        const externalRequest = require('../../../server/lib/request-external.js');
+
+        const recommendationMetadataService = new RecommendationMetadataService({
+            oembedService,
+            externalRequest
+        });
+
         this.service = new RecommendationService({
             repository: this.repository,
             recommendationEnablerService,
             wellknownService,
             mentionSendingService: mentions.sendingService,
             clickEventRepository: this.clickEventRepository,
-            subscribeEventRepository: this.subscribeEventRepository
+            subscribeEventRepository: this.subscribeEventRepository,
+            recommendationMetadataService
         });
 
         const mail = require('../mail');
diff --git a/ghost/core/core/server/web/api/endpoints/admin/routes.js b/ghost/core/core/server/web/api/endpoints/admin/routes.js
index 8dfd990d3e0..4fb71779544 100644
--- a/ghost/core/core/server/web/api/endpoints/admin/routes.js
+++ b/ghost/core/core/server/web/api/endpoints/admin/routes.js
@@ -351,6 +351,7 @@ module.exports = function apiRoutes() {
     router.get('/recommendations', mw.authAdminApi, http(api.recommendations.browse));
     router.get('/recommendations/:id', mw.authAdminApi, http(api.recommendations.read));
     router.post('/recommendations', mw.authAdminApi, http(api.recommendations.add));
+    router.post('/recommendations/check', mw.authAdminApi, http(api.recommendations.check));
     router.put('/recommendations/:id', mw.authAdminApi, http(api.recommendations.edit));
     router.del('/recommendations/:id', mw.authAdminApi, http(api.recommendations.destroy));
 
diff --git a/ghost/core/core/shared/labs.js b/ghost/core/core/shared/labs.js
index a1b0e2e1736..cfb05e85bef 100644
--- a/ghost/core/core/shared/labs.js
+++ b/ghost/core/core/shared/labs.js
@@ -20,7 +20,8 @@ const GA_FEATURES = [
     'outboundLinkTagging',
     'announcementBar',
     'signupForm',
-    'recommendations'
+    'recommendations',
+    'editorEmojiPicker'
 ];
 
 // NOTE: this allowlist is meant to be used to filter out any unexpected
@@ -43,7 +44,7 @@ const ALPHA_FEATURES = [
     'importMemberTier',
     'lexicalIndicators',
     'listUnsubscribeHeader',
-    'editorEmojiPicker'
+    'adminXOffers'
 ];
 
 module.exports.GA_KEYS = [...GA_FEATURES];
diff --git a/ghost/core/core/shared/sentry.js b/ghost/core/core/shared/sentry.js
index c410247c75e..c2d52b10d72 100644
--- a/ghost/core/core/shared/sentry.js
+++ b/ghost/core/core/shared/sentry.js
@@ -22,13 +22,25 @@ if (sentryConfig && !sentryConfig.disabled) {
                     event.exception.values[0].type = exception.context;
                 }
 
+                // This is a mysql2 error — add some additional context
+                if (exception.sql) {
+                    event.exception.values[0].type = `SQL Error ${exception.errno}: ${exception.sqlErrorCode}`;
+                    event.exception.values[0].value = exception.sqlMessage;
+                    event.contexts.mysql = {
+                        errno: exception.errno,
+                        code: exception.sqlErrorCode,
+                        sql: exception.sql,
+                        message: exception.sqlMessage,
+                        state: exception.sqlState
+                    };
+                }
+
                 // This is a Ghost Error, copy all our extra data to tags
                 event.tags.type = exception.errorType;
                 event.tags.code = exception.code;
                 event.tags.id = exception.id;
-                event.tags.statusCode = exception.statusCode;
+                event.tags.status_code = exception.statusCode;
             }
-
             return event;
         }
     });
diff --git a/ghost/core/package.json b/ghost/core/package.json
index f95c3919e63..b62801c95f5 100644
--- a/ghost/core/package.json
+++ b/ghost/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ghost",
-  "version": "5.70.2",
+  "version": "5.73.1",
   "description": "The professional publishing platform",
   "author": "Ghost Foundation",
   "homepage": "https://ghost.org",
@@ -58,55 +58,55 @@
   },
   "dependencies": {
     "@extractus/oembed-extractor": "3.2.1",
-    "@sentry/node": "7.70.0",
-    "@tryghost/adapter-base-cache": "0.1.5",
+    "@sentry/node": "7.78.0",
+    "@tryghost/adapter-base-cache": "0.1.10",
     "@tryghost/adapter-cache-redis": "0.0.0",
     "@tryghost/adapter-manager": "0.0.0",
-    "@tryghost/admin-api-schema": "4.5.1",
+    "@tryghost/admin-api-schema": "4.5.3",
     "@tryghost/announcement-bar-settings": "0.0.0",
     "@tryghost/api-framework": "0.0.0",
     "@tryghost/api-version-compatibility-service": "0.0.0",
     "@tryghost/audience-feedback": "0.0.0",
-    "@tryghost/bookshelf-plugins": "0.6.10",
+    "@tryghost/bookshelf-plugins": "0.6.11",
     "@tryghost/bootstrap-socket": "0.0.0",
     "@tryghost/collections": "0.0.0",
-    "@tryghost/color-utils": "0.1.24",
-    "@tryghost/config-url-helpers": "1.0.6",
+    "@tryghost/color-utils": "0.2.0",
+    "@tryghost/config-url-helpers": "1.0.10",
     "@tryghost/constants": "0.0.0",
     "@tryghost/custom-theme-settings-service": "0.0.0",
     "@tryghost/data-generator": "0.0.0",
-    "@tryghost/database-info": "0.3.17",
-    "@tryghost/debug": "0.1.24",
+    "@tryghost/database-info": "0.3.20",
+    "@tryghost/debug": "0.1.26",
     "@tryghost/domain-events": "0.0.0",
     "@tryghost/donations": "0.0.0",
     "@tryghost/dynamic-routing-events": "0.0.0",
     "@tryghost/email-analytics-provider-mailgun": "0.0.0",
     "@tryghost/email-analytics-service": "0.0.0",
     "@tryghost/email-content-generator": "0.0.0",
-    "@tryghost/email-mock-receiver": "0.3.1",
+    "@tryghost/email-mock-receiver": "0.3.2",
     "@tryghost/email-service": "0.0.0",
     "@tryghost/email-suppression-list": "0.0.0",
     "@tryghost/errors": "1.2.26",
     "@tryghost/event-aware-cache-wrapper": "0.0.0",
     "@tryghost/express-dynamic-redirects": "0.0.0",
     "@tryghost/external-media-inliner": "0.0.0",
-    "@tryghost/helpers": "1.1.82",
+    "@tryghost/helpers": "1.1.88",
     "@tryghost/html-to-plaintext": "0.0.0",
-    "@tryghost/http-cache-utils": "0.1.9",
+    "@tryghost/http-cache-utils": "0.1.11",
     "@tryghost/i18n": "0.0.0",
-    "@tryghost/image-transform": "1.2.6",
+    "@tryghost/image-transform": "1.2.10",
     "@tryghost/importer-handler-content-files": "0.0.0",
     "@tryghost/importer-revue": "0.0.0",
     "@tryghost/job-manager": "0.0.0",
-    "@tryghost/kg-card-factory": "4.0.14",
-    "@tryghost/kg-converters": "0.0.21",
+    "@tryghost/kg-card-factory": "4.0.15",
+    "@tryghost/kg-converters": "0.0.22",
     "@tryghost/kg-default-atoms": "4.0.3",
-    "@tryghost/kg-default-cards": "9.1.8",
-    "@tryghost/kg-default-nodes": "0.2.6",
-    "@tryghost/kg-html-to-lexical": "0.1.7",
-    "@tryghost/kg-lexical-html-renderer": "0.3.42",
-    "@tryghost/kg-mobiledoc-html-renderer": "6.0.14",
-    "@tryghost/limit-service": "1.2.10",
+    "@tryghost/kg-default-cards": "9.1.9",
+    "@tryghost/kg-default-nodes": "0.2.8",
+    "@tryghost/kg-html-to-lexical": "0.1.9",
+    "@tryghost/kg-lexical-html-renderer": "0.3.45",
+    "@tryghost/kg-mobiledoc-html-renderer": "6.0.15",
+    "@tryghost/limit-service": "1.2.12",
     "@tryghost/link-redirects": "0.0.0",
     "@tryghost/link-replacer": "0.0.0",
     "@tryghost/link-tracking": "0.0.0",
@@ -124,7 +124,7 @@
     "@tryghost/members-ssr": "0.0.0",
     "@tryghost/members-stripe-service": "0.0.0",
     "@tryghost/mentions-email-report": "0.0.0",
-    "@tryghost/metrics": "1.0.24",
+    "@tryghost/metrics": "1.0.27",
     "@tryghost/milestones": "0.0.0",
     "@tryghost/minifier": "0.0.0",
     "@tryghost/model-to-domain-event-interceptor": "0.0.0",
@@ -134,31 +134,31 @@
     "@tryghost/mw-session-from-token": "0.0.0",
     "@tryghost/mw-version-match": "0.0.0",
     "@tryghost/mw-vhost": "0.0.0",
-    "@tryghost/nodemailer": "0.3.35",
+    "@tryghost/nodemailer": "0.3.37",
     "@tryghost/nql": "0.11.0",
     "@tryghost/oembed-service": "0.0.0",
     "@tryghost/package-json": "0.0.0",
     "@tryghost/post-revisions": "0.0.0",
     "@tryghost/posts-service": "0.0.0",
-    "@tryghost/pretty-cli": "1.2.36",
-    "@tryghost/promise": "0.3.4",
+    "@tryghost/pretty-cli": "1.2.38",
+    "@tryghost/promise": "0.3.6",
     "@tryghost/recommendations": "0.0.0",
     "@tryghost/request": "1.0.0",
     "@tryghost/security": "0.0.0",
     "@tryghost/session-service": "0.0.0",
     "@tryghost/settings-path-manager": "0.0.0",
     "@tryghost/slack-notifications": "0.0.0",
-    "@tryghost/social-urls": "0.1.36",
+    "@tryghost/social-urls": "0.1.41",
     "@tryghost/staff-service": "0.0.0",
     "@tryghost/stats-service": "0.0.0",
-    "@tryghost/string": "0.2.4",
+    "@tryghost/string": "0.2.10",
     "@tryghost/tiers": "0.0.0",
-    "@tryghost/tpl": "0.1.24",
+    "@tryghost/tpl": "0.1.26",
     "@tryghost/update-check-service": "0.0.0",
-    "@tryghost/url-utils": "4.4.0",
-    "@tryghost/validator": "0.2.4",
+    "@tryghost/url-utils": "4.4.6",
+    "@tryghost/validator": "0.2.6",
     "@tryghost/verification-trigger": "0.0.0",
-    "@tryghost/version": "0.1.22",
+    "@tryghost/version": "0.1.24",
     "@tryghost/webmentions": "0.0.0",
     "@tryghost/zip": "1.1.38",
     "amperize": "0.6.1",
@@ -187,7 +187,7 @@
     "ghost-storage-base": "1.0.0",
     "glob": "8.1.0",
     "got": "11.8.6",
-    "gscan": "4.39.4",
+    "gscan": "4.40.0",
     "human-number": "2.0.4",
     "image-size": "1.0.2",
     "intl": "1.2.5",
@@ -203,13 +203,13 @@
     "knex-migrator": "5.1.5",
     "lib0": "0.2.87",
     "lodash": "4.17.21",
-    "luxon": "3.4.3",
+    "luxon": "3.4.4",
     "moment": "2.24.0",
     "moment-timezone": "0.5.23",
     "multer": "1.4.4",
-    "mysql2": "3.6.2",
+    "mysql2": "3.6.3",
     "nconf": "0.12.1",
-    "newrelic": "11.4.0",
+    "newrelic": "11.5.0",
     "node-jose": "2.2.0",
     "path-match": "1.2.4",
     "probe-image-size": "7.2.3",
@@ -225,15 +225,15 @@
     "yjs": "13.6.8"
   },
   "optionalDependencies": {
-    "@tryghost/html-to-mobiledoc": "2.0.36",
+    "@tryghost/html-to-mobiledoc": "2.0.42",
     "sqlite3": "5.1.6"
   },
   "devDependencies": {
     "@actions/core": "1.10.1",
     "@playwright/test": "1.38.1",
     "@tryghost/express-test": "0.13.7",
-    "@tryghost/webhook-mock-receiver": "0.2.6",
-    "@types/common-tags": "1.8.2",
+    "@tryghost/webhook-mock-receiver": "0.2.8",
+    "@types/common-tags": "1.8.4",
     "c8": "8.0.1",
     "cli-progress": "3.12.0",
     "cssnano": "6.0.1",
@@ -244,7 +244,7 @@
     "mocha": "10.2.0",
     "mocha-slow-test-reporter": "0.1.2",
     "mock-knex": "TryGhost/mock-knex#d8b93b1c20d4820323477f2c60db016ab3e73192",
-    "monobundle": "TryGhost/monobundle#44fdf2c8e304e797a04858bfd7339b2a1fa47441",
+    "monobundle": "TryGhost/monobundle#811679e94b75f82a0fb1d00a11e6e0b9f6e5e44a",
     "nock": "13.3.3",
     "papaparse": "5.3.2",
     "postcss": "8.4.31",
diff --git a/ghost/core/test/e2e-api/admin/__snapshots__/email-previews.test.js.snap b/ghost/core/test/e2e-api/admin/__snapshots__/email-previews.test.js.snap
index 116f918fa52..aa14686fcfd 100644
--- a/ghost/core/test/e2e-api/admin/__snapshots__/email-previews.test.js.snap
+++ b/ghost/core/test/e2e-api/admin/__snapshots__/email-previews.test.js.snap
@@ -191,8 +191,7 @@ Object {
   table.body p,
 table.body ul,
 table.body ol,
-table.body td,
-table.body span {
+table.body td {
     font-size: 16px !important;
   }
 
@@ -308,35 +307,30 @@ table.body .feedback-button-mobile-text {
   }
 
   table.body .latest-posts-header {
-    font-size: 14px !important;
-  }
-
-  table.body .latest-post-img {
-    display: none !important;
-  }
-
-  table.body .latest-post-img-mobile {
-    display: inline-block !important;
-    width: 100%;
+    font-size: 12px !important;
   }
 
   table.body .latest-post-title {
     display: inline-block !important;
     width: 100%;
-    padding-right: 0 !important;
-    padding-bottom: 8px !important;
+    padding-right: 8px !important;
   }
 
   table.body .latest-post h4,
 table.body .latest-post h4 span {
-    padding: 4px 0 !important;
-    font-size: 18px !important;
+    padding: 4px 0 6px !important;
+    font-size: 15px !important;
   }
 
-  table.body .latest-post p,
-table.body .latest-post p span {
+  table.body .latest-post-excerpt,
+table.body .latest-post-excerpt a,
+table.body .latest-post-excerpt span {
     font-size: 13px !important;
-    line-height: 1.25em;
+    line-height: 1.2 !important;
+  }
+
+  table.body .latest-post-excerpt span {
+    display: none !important;
   }
 
   table.body .subscription-box h3 {
@@ -381,7 +375,8 @@ table.body .manage-subscription {
     line-height: 1.3em !important;
   }
 
-  table.body h2 {
+  table.body h2,
+table.body h2 span {
     font-size: 26px !important;
     line-height: 1.22em !important;
   }
@@ -427,11 +422,6 @@ table.body .manage-subscription {
   table.body hr {
     margin: 2em 0 !important;
   }
-
-  table.body figcaption,
-table.body figcaption a {
-    font-size: 13px !important;
-  }
 }
 @media all {
   .subscription-details p.hidden {
@@ -735,7 +725,7 @@ exports[`Email Preview API Read can read post email preview with email card and
 Object {
   "access-control-allow-origin": "http://127.0.0.1:2369",
   "cache-control": "no-cache, private, no-store, must-revalidate, max-stale=0, post-check=0, pre-check=0",
-  "content-length": "23925",
+  "content-length": "23765",
   "content-type": "application/json; charset=utf-8",
   "content-version": StringMatching /v\\\\d\\+\\\\\\.\\\\d\\+/,
   "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
@@ -840,8 +830,7 @@ Object {
   table.body p,
 table.body ul,
 table.body ol,
-table.body td,
-table.body span {
+table.body td {
     font-size: 16px !important;
   }
 
@@ -957,35 +946,30 @@ table.body .feedback-button-mobile-text {
   }
 
   table.body .latest-posts-header {
-    font-size: 14px !important;
-  }
-
-  table.body .latest-post-img {
-    display: none !important;
-  }
-
-  table.body .latest-post-img-mobile {
-    display: inline-block !important;
-    width: 100%;
+    font-size: 12px !important;
   }
 
   table.body .latest-post-title {
     display: inline-block !important;
     width: 100%;
-    padding-right: 0 !important;
-    padding-bottom: 8px !important;
+    padding-right: 8px !important;
   }
 
   table.body .latest-post h4,
 table.body .latest-post h4 span {
-    padding: 4px 0 !important;
-    font-size: 18px !important;
+    padding: 4px 0 6px !important;
+    font-size: 15px !important;
   }
 
-  table.body .latest-post p,
-table.body .latest-post p span {
+  table.body .latest-post-excerpt,
+table.body .latest-post-excerpt a,
+table.body .latest-post-excerpt span {
     font-size: 13px !important;
-    line-height: 1.25em;
+    line-height: 1.2 !important;
+  }
+
+  table.body .latest-post-excerpt span {
+    display: none !important;
   }
 
   table.body .subscription-box h3 {
@@ -1030,7 +1014,8 @@ table.body .manage-subscription {
     line-height: 1.3em !important;
   }
 
-  table.body h2 {
+  table.body h2,
+table.body h2 span {
     font-size: 26px !important;
     line-height: 1.22em !important;
   }
@@ -1076,11 +1061,6 @@ table.body .manage-subscription {
   table.body hr {
     margin: 2em 0 !important;
   }
-
-  table.body figcaption,
-table.body figcaption a {
-    font-size: 13px !important;
-  }
 }
 @media all {
   .subscription-details p.hidden {
@@ -1404,7 +1384,7 @@ exports[`Email Preview API Read can read post email preview with fields 4: [head
 Object {
   "access-control-allow-origin": "http://127.0.0.1:2369",
   "cache-control": "no-cache, private, no-store, must-revalidate, max-stale=0, post-check=0, pre-check=0",
-  "content-length": "28736",
+  "content-length": "28576",
   "content-type": "application/json; charset=utf-8",
   "content-version": StringMatching /v\\\\d\\+\\\\\\.\\\\d\\+/,
   "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
@@ -1540,8 +1520,7 @@ Object {
   table.body p,
 table.body ul,
 table.body ol,
-table.body td,
-table.body span {
+table.body td {
     font-size: 16px !important;
   }
 
@@ -1657,35 +1636,30 @@ table.body .feedback-button-mobile-text {
   }
 
   table.body .latest-posts-header {
-    font-size: 14px !important;
-  }
-
-  table.body .latest-post-img {
-    display: none !important;
-  }
-
-  table.body .latest-post-img-mobile {
-    display: inline-block !important;
-    width: 100%;
+    font-size: 12px !important;
   }
 
   table.body .latest-post-title {
     display: inline-block !important;
     width: 100%;
-    padding-right: 0 !important;
-    padding-bottom: 8px !important;
+    padding-right: 8px !important;
   }
 
   table.body .latest-post h4,
 table.body .latest-post h4 span {
-    padding: 4px 0 !important;
-    font-size: 18px !important;
+    padding: 4px 0 6px !important;
+    font-size: 15px !important;
   }
 
-  table.body .latest-post p,
-table.body .latest-post p span {
+  table.body .latest-post-excerpt,
+table.body .latest-post-excerpt a,
+table.body .latest-post-excerpt span {
     font-size: 13px !important;
-    line-height: 1.25em;
+    line-height: 1.2 !important;
+  }
+
+  table.body .latest-post-excerpt span {
+    display: none !important;
   }
 
   table.body .subscription-box h3 {
@@ -1730,7 +1704,8 @@ table.body .manage-subscription {
     line-height: 1.3em !important;
   }
 
-  table.body h2 {
+  table.body h2,
+table.body h2 span {
     font-size: 26px !important;
     line-height: 1.22em !important;
   }
@@ -1776,11 +1751,6 @@ table.body .manage-subscription {
   table.body hr {
     margin: 2em 0 !important;
   }
-
-  table.body figcaption,
-table.body figcaption a {
-    font-size: 13px !important;
-  }
 }
 @media all {
   .subscription-details p.hidden {
@@ -2091,7 +2061,7 @@ exports[`Email Preview API Read has custom content transformations for email com
 Object {
   "access-control-allow-origin": "http://127.0.0.1:2369",
   "cache-control": "no-cache, private, no-store, must-revalidate, max-stale=0, post-check=0, pre-check=0",
-  "content-length": "23679",
+  "content-length": "23519",
   "content-type": "application/json; charset=utf-8",
   "content-version": StringMatching /v\\\\d\\+\\\\\\.\\\\d\\+/,
   "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
@@ -2556,8 +2526,7 @@ Object {
   table.body p,
 table.body ul,
 table.body ol,
-table.body td,
-table.body span {
+table.body td {
     font-size: 16px !important;
   }
 
@@ -2673,35 +2642,30 @@ table.body .feedback-button-mobile-text {
   }
 
   table.body .latest-posts-header {
-    font-size: 14px !important;
-  }
-
-  table.body .latest-post-img {
-    display: none !important;
-  }
-
-  table.body .latest-post-img-mobile {
-    display: inline-block !important;
-    width: 100%;
+    font-size: 12px !important;
   }
 
   table.body .latest-post-title {
     display: inline-block !important;
     width: 100%;
-    padding-right: 0 !important;
-    padding-bottom: 8px !important;
+    padding-right: 8px !important;
   }
 
   table.body .latest-post h4,
 table.body .latest-post h4 span {
-    padding: 4px 0 !important;
-    font-size: 18px !important;
+    padding: 4px 0 6px !important;
+    font-size: 15px !important;
   }
 
-  table.body .latest-post p,
-table.body .latest-post p span {
+  table.body .latest-post-excerpt,
+table.body .latest-post-excerpt a,
+table.body .latest-post-excerpt span {
     font-size: 13px !important;
-    line-height: 1.25em;
+    line-height: 1.2 !important;
+  }
+
+  table.body .latest-post-excerpt span {
+    display: none !important;
   }
 
   table.body .subscription-box h3 {
@@ -2746,7 +2710,8 @@ table.body .manage-subscription {
     line-height: 1.3em !important;
   }
 
-  table.body h2 {
+  table.body h2,
+table.body h2 span {
     font-size: 26px !important;
     line-height: 1.22em !important;
   }
@@ -2792,11 +2757,6 @@ table.body .manage-subscription {
   table.body hr {
     margin: 2em 0 !important;
   }
-
-  table.body figcaption,
-table.body figcaption a {
-    font-size: 13px !important;
-  }
 }
 @media all {
   .subscription-details p.hidden {
@@ -3117,7 +3077,7 @@ exports[`Email Preview API Read uses the newsletter provided through ?newsletter
 Object {
   "access-control-allow-origin": "http://127.0.0.1:2369",
   "cache-control": "no-cache, private, no-store, must-revalidate, max-stale=0, post-check=0, pre-check=0",
-  "content-length": "24171",
+  "content-length": "24011",
   "content-type": "application/json; charset=utf-8",
   "content-version": StringMatching /v\\\\d\\+\\\\\\.\\\\d\\+/,
   "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
@@ -3608,8 +3568,7 @@ Object {
   table.body p,
 table.body ul,
 table.body ol,
-table.body td,
-table.body span {
+table.body td {
     font-size: 16px !important;
   }
 
@@ -3725,35 +3684,30 @@ table.body .feedback-button-mobile-text {
   }
 
   table.body .latest-posts-header {
-    font-size: 14px !important;
-  }
-
-  table.body .latest-post-img {
-    display: none !important;
-  }
-
-  table.body .latest-post-img-mobile {
-    display: inline-block !important;
-    width: 100%;
+    font-size: 12px !important;
   }
 
   table.body .latest-post-title {
     display: inline-block !important;
     width: 100%;
-    padding-right: 0 !important;
-    padding-bottom: 8px !important;
+    padding-right: 8px !important;
   }
 
   table.body .latest-post h4,
 table.body .latest-post h4 span {
-    padding: 4px 0 !important;
-    font-size: 18px !important;
+    padding: 4px 0 6px !important;
+    font-size: 15px !important;
   }
 
-  table.body .latest-post p,
-table.body .latest-post p span {
+  table.body .latest-post-excerpt,
+table.body .latest-post-excerpt a,
+table.body .latest-post-excerpt span {
     font-size: 13px !important;
-    line-height: 1.25em;
+    line-height: 1.2 !important;
+  }
+
+  table.body .latest-post-excerpt span {
+    display: none !important;
   }
 
   table.body .subscription-box h3 {
@@ -3798,7 +3752,8 @@ table.body .manage-subscription {
     line-height: 1.3em !important;
   }
 
-  table.body h2 {
+  table.body h2,
+table.body h2 span {
     font-size: 26px !important;
     line-height: 1.22em !important;
   }
@@ -3844,11 +3799,6 @@ table.body .manage-subscription {
   table.body hr {
     margin: 2em 0 !important;
   }
-
-  table.body figcaption,
-table.body figcaption a {
-    font-size: 13px !important;
-  }
 }
 @media all {
   .subscription-details p.hidden {
@@ -4169,7 +4119,7 @@ exports[`Email Preview API Read uses the posts newsletter by default 4: [headers
 Object {
   "access-control-allow-origin": "http://127.0.0.1:2369",
   "cache-control": "no-cache, private, no-store, must-revalidate, max-stale=0, post-check=0, pre-check=0",
-  "content-length": "24171",
+  "content-length": "24011",
   "content-type": "application/json; charset=utf-8",
   "content-version": StringMatching /v\\\\d\\+\\\\\\.\\\\d\\+/,
   "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
diff --git a/ghost/core/test/e2e-api/admin/__snapshots__/members.test.js.snap b/ghost/core/test/e2e-api/admin/__snapshots__/members.test.js.snap
index 5f8ebe3b5e4..7485981efe2 100644
--- a/ghost/core/test/e2e-api/admin/__snapshots__/members.test.js.snap
+++ b/ghost/core/test/e2e-api/admin/__snapshots__/members.test.js.snap
@@ -5947,6 +5947,171 @@ Object {
 }
 `;
 
+exports[`Members API Updates the email_disabled field 1: [body] 1`] = `
+Object {
+  "members": Array [
+    Object {
+      "attribution": Object {
+        "id": null,
+        "referrer_medium": "Ghost Admin",
+        "referrer_source": "Created manually",
+        "referrer_url": null,
+        "title": null,
+        "type": null,
+        "url": null,
+      },
+      "avatar_image": null,
+      "comped": false,
+      "created_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/,
+      "email": "ok@email.com",
+      "email_count": 0,
+      "email_open_rate": null,
+      "email_opened_count": 0,
+      "email_suppression": Object {
+        "info": null,
+        "suppressed": false,
+      },
+      "geolocation": null,
+      "id": StringMatching /\\[a-f0-9\\]\\{24\\}/,
+      "labels": Any<Array>,
+      "last_seen_at": null,
+      "name": "Existing Member",
+      "newsletters": Array [
+        Object {
+          "description": null,
+          "id": StringMatching /\\[a-f0-9\\]\\{24\\}/,
+          "name": "Default Newsletter",
+          "status": "active",
+        },
+        Object {
+          "description": null,
+          "id": StringMatching /\\[a-f0-9\\]\\{24\\}/,
+          "name": "Weekly newsletter",
+          "status": "active",
+        },
+      ],
+      "note": null,
+      "status": "free",
+      "subscribed": true,
+      "subscriptions": Any<Array>,
+      "tiers": Array [],
+      "updated_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/,
+      "uuid": StringMatching /\\[a-f0-9\\]\\{8\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{12\\}/,
+    },
+  ],
+}
+`;
+
+exports[`Members API Updates the email_disabled field 2: [headers] 1`] = `
+Object {
+  "access-control-allow-origin": "http://127.0.0.1:2369",
+  "cache-control": "no-cache, private, no-store, must-revalidate, max-stale=0, post-check=0, pre-check=0",
+  "content-length": "862",
+  "content-type": "application/json; charset=utf-8",
+  "content-version": StringMatching /v\\\\d\\+\\\\\\.\\\\d\\+/,
+  "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
+  "vary": "Accept-Version, Origin, Accept-Encoding",
+  "x-powered-by": "Express",
+}
+`;
+
+exports[`Members API Updates the email_disabled field when a member email is updated 1: [body] 1`] = `
+Object {
+  "members": Array [
+    Object {
+      "attribution": null,
+      "avatar_image": null,
+      "comped": false,
+      "created_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/,
+      "email": "suppressed@email.com",
+      "email_count": 0,
+      "email_open_rate": null,
+      "email_opened_count": 0,
+      "email_suppression": Object {
+        "info": Object {
+          "reason": "fail",
+          "timestamp": "2023-11-02T15:37:09.000Z",
+        },
+        "suppressed": true,
+      },
+      "geolocation": null,
+      "id": StringMatching /\\[a-f0-9\\]\\{24\\}/,
+      "labels": Any<Array>,
+      "last_seen_at": null,
+      "name": "Test Member 123",
+      "newsletters": Array [],
+      "note": null,
+      "status": "free",
+      "subscribed": false,
+      "subscriptions": Any<Array>,
+      "tiers": Array [],
+      "updated_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/,
+      "uuid": StringMatching /\\[a-f0-9\\]\\{8\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{12\\}/,
+    },
+  ],
+}
+`;
+
+exports[`Members API Updates the email_disabled field when a member email is updated 2: [headers] 1`] = `
+Object {
+  "access-control-allow-origin": "http://127.0.0.1:2369",
+  "cache-control": "no-cache, private, no-store, must-revalidate, max-stale=0, post-check=0, pre-check=0",
+  "content-length": "594",
+  "content-type": "application/json; charset=utf-8",
+  "content-version": StringMatching /v\\\\d\\+\\\\\\.\\\\d\\+/,
+  "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
+  "vary": "Accept-Version, Origin, Accept-Encoding",
+  "x-powered-by": "Express",
+}
+`;
+
+exports[`Members API Updates the email_disabled field when a member email is updated 3: [body] 1`] = `
+Object {
+  "members": Array [
+    Object {
+      "attribution": null,
+      "avatar_image": null,
+      "comped": false,
+      "created_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/,
+      "email": "ok@email.com",
+      "email_count": 0,
+      "email_open_rate": null,
+      "email_opened_count": 0,
+      "email_suppression": Object {
+        "info": null,
+        "suppressed": false,
+      },
+      "geolocation": null,
+      "id": StringMatching /\\[a-f0-9\\]\\{24\\}/,
+      "labels": Any<Array>,
+      "last_seen_at": null,
+      "name": "Test Member 123",
+      "newsletters": Array [],
+      "note": null,
+      "status": "free",
+      "subscribed": false,
+      "subscriptions": Any<Array>,
+      "tiers": Array [],
+      "updated_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/,
+      "uuid": StringMatching /\\[a-f0-9\\]\\{8\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{12\\}/,
+    },
+  ],
+}
+`;
+
+exports[`Members API Updates the email_disabled field when a member email is updated 4: [headers] 1`] = `
+Object {
+  "access-control-allow-origin": "http://127.0.0.1:2369",
+  "cache-control": "no-cache, private, no-store, must-revalidate, max-stale=0, post-check=0, pre-check=0",
+  "content-length": "535",
+  "content-type": "application/json; charset=utf-8",
+  "content-version": StringMatching /v\\\\d\\+\\\\\\.\\\\d\\+/,
+  "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
+  "vary": "Accept-Version, Origin, Accept-Encoding",
+  "x-powered-by": "Express",
+}
+`;
+
 exports[`Members API Updating member data without newsletters does not change newsletters 1: [body] 1`] = `
 Object {
   "members": Array [
diff --git a/ghost/core/test/e2e-api/admin/__snapshots__/posts.test.js.snap b/ghost/core/test/e2e-api/admin/__snapshots__/posts.test.js.snap
index 585ec0e9818..f4628112bf6 100644
--- a/ghost/core/test/e2e-api/admin/__snapshots__/posts.test.js.snap
+++ b/ghost/core/test/e2e-api/admin/__snapshots__/posts.test.js.snap
@@ -1789,7 +1789,7 @@ Object {
   "access-control-allow-origin": "http://127.0.0.1:2369",
   "cache-control": "no-cache, private, no-store, must-revalidate, max-stale=0, post-check=0, pre-check=0",
   "content-disposition": StringMatching /\\^Attachment; filename="post-analytics\\.\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}\\.csv"\\$/,
-  "content-length": "2721",
+  "content-length": "2716",
   "content-type": "text/csv; charset=utf-8",
   "content-version": StringMatching /v\\\\d\\+\\\\\\.\\\\d\\+/,
   "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
@@ -1800,7 +1800,7 @@ Object {
 
 exports[`Posts API Export Can export 2 1`] = `
 Object {
-  "text": "id,title,url,author,status,created_at,updated_at,published_at,featured,tags,post_access,email_recipients,sends,opens,clicks,free_signups,paid_conversions
+  "text": "id,title,url,author,status,created_at,updated_at,published_at,featured,tags,post_access,email_recipients,sends,opens,clicks,signups,paid_conversions
 6194d3ce51e2700162531a77,Start here for a quick overview of everything you need to know,http://127.0.0.1:2369/welcome/,Ghost,published only,2050-01-01T00:00:00.000Z,2050-01-01T00:00:00.000Z,2050-01-01T00:00:00.000Z,false,Getting Started,Public,,,,,0,0
 6194d3ce51e2700162531a76,Customizing your brand and design settings,http://127.0.0.1:2369/design/,Ghost,published only,2050-01-01T00:00:00.000Z,2050-01-01T00:00:00.000Z,2050-01-01T00:00:00.000Z,false,Getting Started,Public,,,,,0,0
 6194d3ce51e2700162531a75,\\"Writing and managing content in Ghost, an advanced guide\\",http://127.0.0.1:2369/write/,Ghost,published only,2050-01-01T00:00:00.000Z,2050-01-01T00:00:00.000Z,2050-01-01T00:00:00.000Z,false,Getting Started,Public,,,,,0,0
@@ -1820,7 +1820,7 @@ Object {
   "access-control-allow-origin": "http://127.0.0.1:2369",
   "cache-control": "no-cache, private, no-store, must-revalidate, max-stale=0, post-check=0, pre-check=0",
   "content-disposition": StringMatching /\\^Attachment; filename="post-analytics\\.\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}\\.csv"\\$/,
-  "content-length": "587",
+  "content-length": "582",
   "content-type": "text/csv; charset=utf-8",
   "content-version": StringMatching /v\\\\d\\+\\\\\\.\\\\d\\+/,
   "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
@@ -1831,7 +1831,7 @@ Object {
 
 exports[`Posts API Export Can export with filter 2 1`] = `
 Object {
-  "text": "id,title,url,author,status,created_at,updated_at,published_at,featured,tags,post_access,email_recipients,sends,opens,clicks,free_signups,paid_conversions
+  "text": "id,title,url,author,status,created_at,updated_at,published_at,featured,tags,post_access,email_recipients,sends,opens,clicks,signups,paid_conversions
 618ba1ffbe2896088840a6e7,\\"Not so short, bit complex\\",http://127.0.0.1:2369/not-so-short-bit-complex/,Joe Bloggs,published only,2050-01-01T00:00:00.000Z,2050-01-01T00:00:00.000Z,2050-01-01T00:00:00.000Z,true,,Public,,,,,0,0
 618ba1ffbe2896088840a6e3,Short and Sweet,http://127.0.0.1:2369/short-and-sweet/,Joe Bloggs,published only,2050-01-01T00:00:00.000Z,2050-01-01T00:00:00.000Z,2050-01-01T00:00:00.000Z,true,chorizo,Public,,,,,0,0",
 }
@@ -1842,7 +1842,7 @@ Object {
   "access-control-allow-origin": "http://127.0.0.1:2369",
   "cache-control": "no-cache, private, no-store, must-revalidate, max-stale=0, post-check=0, pre-check=0",
   "content-disposition": StringMatching /\\^Attachment; filename="post-analytics\\.\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}\\.csv"\\$/,
-  "content-length": "406",
+  "content-length": "401",
   "content-type": "text/csv; charset=utf-8",
   "content-version": StringMatching /v\\\\d\\+\\\\\\.\\\\d\\+/,
   "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
@@ -1853,7 +1853,7 @@ Object {
 
 exports[`Posts API Export Can export with limit 2 1`] = `
 Object {
-  "text": "id,title,url,author,status,created_at,updated_at,published_at,featured,tags,post_access,email_recipients,sends,opens,clicks,free_signups,paid_conversions
+  "text": "id,title,url,author,status,created_at,updated_at,published_at,featured,tags,post_access,email_recipients,sends,opens,clicks,signups,paid_conversions
 6194d3ce51e2700162531a77,Start here for a quick overview of everything you need to know,http://127.0.0.1:2369/welcome/,Ghost,published only,2050-01-01T00:00:00.000Z,2050-01-01T00:00:00.000Z,2050-01-01T00:00:00.000Z,false,Getting Started,Public,,,,,0,0",
 }
 `;
@@ -1863,7 +1863,7 @@ Object {
   "access-control-allow-origin": "http://127.0.0.1:2369",
   "cache-control": "no-cache, private, no-store, must-revalidate, max-stale=0, post-check=0, pre-check=0",
   "content-disposition": StringMatching /\\^Attachment; filename="post-analytics\\.\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}\\.csv"\\$/,
-  "content-length": "2721",
+  "content-length": "2716",
   "content-type": "text/csv; charset=utf-8",
   "content-version": StringMatching /v\\\\d\\+\\\\\\.\\\\d\\+/,
   "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
@@ -1874,7 +1874,7 @@ Object {
 
 exports[`Posts API Export Can export with order 2 1`] = `
 Object {
-  "text": "id,title,url,author,status,created_at,updated_at,published_at,featured,tags,post_access,email_recipients,sends,opens,clicks,free_signups,paid_conversions
+  "text": "id,title,url,author,status,created_at,updated_at,published_at,featured,tags,post_access,email_recipients,sends,opens,clicks,signups,paid_conversions
 618ba1ffbe2896088840a6df,HTML Ipsum,http://127.0.0.1:2369/html-ipsum/,Joe Bloggs,published only,2050-01-01T00:00:00.000Z,2050-01-01T00:00:00.000Z,2050-01-01T00:00:00.000Z,false,\\"kitchen sink, bacon\\",Public,,,,,0,0
 618ba1ffbe2896088840a6e1,Ghostly Kitchen Sink,http://127.0.0.1:2369/ghostly-kitchen-sink/,Joe Bloggs,published only,2050-01-01T00:00:00.000Z,2050-01-01T00:00:00.000Z,2050-01-01T00:00:00.000Z,false,\\"kitchen sink, bacon\\",Public,,,,,0,0
 618ba1ffbe2896088840a6e3,Short and Sweet,http://127.0.0.1:2369/short-and-sweet/,Joe Bloggs,published only,2050-01-01T00:00:00.000Z,2050-01-01T00:00:00.000Z,2050-01-01T00:00:00.000Z,true,chorizo,Public,,,,,0,0
diff --git a/ghost/core/test/e2e-api/admin/__snapshots__/recommendations.test.js.snap b/ghost/core/test/e2e-api/admin/__snapshots__/recommendations.test.js.snap
index d6cf4091170..76a2963aaba 100644
--- a/ghost/core/test/e2e-api/admin/__snapshots__/recommendations.test.js.snap
+++ b/ghost/core/test/e2e-api/admin/__snapshots__/recommendations.test.js.snap
@@ -2184,6 +2184,39 @@ Object {
 }
 `;
 
+exports[`Recommendations Admin API check Can check a recommendation url 1: [body] 1`] = `
+Object {
+  "recommendations": Array [
+    Object {
+      "created_at": null,
+      "description": null,
+      "excerpt": "Because dogs are cute",
+      "favicon": "https://dogpictures.com/favicon.ico",
+      "featured_image": "https://dogpictures.com/dog.jpg",
+      "id": null,
+      "one_click_subscribe": true,
+      "title": "Dog Pictures",
+      "updated_at": null,
+      "url": "https://dogpictures.com/",
+    },
+  ],
+}
+`;
+
+exports[`Recommendations Admin API check Can check a recommendation url 2: [headers] 1`] = `
+Object {
+  "access-control-allow-origin": "http://127.0.0.1:2369",
+  "cache-control": "no-cache, private, no-store, must-revalidate, max-stale=0, post-check=0, pre-check=0",
+  "content-length": "304",
+  "content-type": "application/json; charset=utf-8",
+  "content-version": StringMatching /v\\\\d\\+\\\\\\.\\\\d\\+/,
+  "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
+  "vary": "Accept-Version, Origin, Accept-Encoding",
+  "x-cache-invalidate": "/*",
+  "x-powered-by": "Express",
+}
+`;
+
 exports[`Recommendations Admin API delete Can delete recommendation 1: [body] 1`] = `Object {}`;
 
 exports[`Recommendations Admin API delete Can delete recommendation 2: [headers] 1`] = `
diff --git a/ghost/core/test/e2e-api/admin/__snapshots__/settings.test.js.snap b/ghost/core/test/e2e-api/admin/__snapshots__/settings.test.js.snap
index 2f7c7edf53a..ace2b6df16b 100644
--- a/ghost/core/test/e2e-api/admin/__snapshots__/settings.test.js.snap
+++ b/ghost/core/test/e2e-api/admin/__snapshots__/settings.test.js.snap
@@ -758,7 +758,7 @@ exports[`Settings API Edit Can edit a setting 2: [headers] 1`] = `
 Object {
   "access-control-allow-origin": "http://127.0.0.1:2369",
   "cache-control": "no-cache, private, no-store, must-revalidate, max-stale=0, post-check=0, pre-check=0",
-  "content-length": "4280",
+  "content-length": "4307",
   "content-type": "application/json; charset=utf-8",
   "content-version": StringMatching /v\\\\d\\+\\\\\\.\\\\d\\+/,
   "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
diff --git a/ghost/core/test/e2e-api/admin/members.test.js b/ghost/core/test/e2e-api/admin/members.test.js
index 72c4caac3da..02b75e5f9ce 100644
--- a/ghost/core/test/e2e-api/admin/members.test.js
+++ b/ghost/core/test/e2e-api/admin/members.test.js
@@ -2097,6 +2097,51 @@ describe('Members API', function () {
             });
     });
 
+    describe('email_disabled', function () {
+        const testMemberId = '6543c13c13575e086a06b222';
+        const suppressedEmail = 'suppressed@email.com';
+        const okEmail = 'ok@email.com';
+
+        let testMember;
+        let suppression;
+
+        beforeEach(async function () {
+            testMember = await models.Member.add({id: testMemberId, email: okEmail, name: 'Test Member 123', email_disabled: false});
+            suppression = await models.Suppression.add({
+                email: suppressedEmail,
+                reason: 'bounce'
+            });
+        });
+
+        afterEach(async function () {
+            // Delete member & suppression
+            await models.Member.destroy({id: testMember.id});
+            await models.Suppression.destroy({id: suppression.id});
+        });
+
+        it('Updates the email_disabled field when a member email is updated', async function () {
+            // Now update the email address of the test member to suppressed email
+            await agent
+                .put(`/members/${testMember.id}/`)
+                .body({members: [{email: suppressedEmail}]})
+                .expectStatus(200);
+
+            // email_disabled should be true
+            await testMember.refresh();
+            should(testMember.get('email_disabled')).be.true();
+
+            // Now update the email address of that member to a non-suppressed email
+            await agent
+                .put(`/members/${testMember.id}/`)
+                .body({members: [{email: okEmail}]})
+                .expectStatus(200);
+
+            // email_disabled should be false
+            await testMember.refresh();
+            should(testMember.get('email_disabled')).be.false();
+        });
+    });
+
     // Delete a member
 
     it('Can destroy', async function () {
diff --git a/ghost/core/test/e2e-api/admin/recommendations.test.js b/ghost/core/test/e2e-api/admin/recommendations.test.js
index 8bf2bb29c19..699aa84c101 100644
--- a/ghost/core/test/e2e-api/admin/recommendations.test.js
+++ b/ghost/core/test/e2e-api/admin/recommendations.test.js
@@ -3,6 +3,7 @@ const {anyObjectId, anyErrorId, anyISODateTime, anyContentVersion, anyLocationFo
 const assert = require('assert/strict');
 const recommendationsService = require('../../../core/server/services/recommendations');
 const {Recommendation, ClickEvent, SubscribeEvent} = require('@tryghost/recommendations');
+const nock = require('nock');
 
 async function addDummyRecommendation(i = 0) {
     const recommendation = Recommendation.create({
@@ -666,6 +667,44 @@ describe('Recommendations Admin API', function () {
         });
     });
 
+    describe('check', function () {
+        it('Can check a recommendation url', async function () {
+            nock('https://dogpictures.com')
+                .get('/members/api/site')
+                .reply(200, {
+                    site: {
+                        title: 'Dog Pictures',
+                        description: 'Because dogs are cute',
+                        cover_image: 'https://dogpictures.com/dog.jpg',
+                        icon: 'https://dogpictures.com/favicon.ico',
+                        allow_external_signup: true
+                    }
+                });
+
+            const {body} = await agent.post('recommendations/check/')
+                .body({
+                    recommendations: [{
+                        url: 'https://dogpictures.com'
+                    }]
+                })
+                .expectStatus(200)
+                .matchHeaderSnapshot({
+                    'content-version': anyContentVersion,
+                    etag: anyEtag
+                })
+                .matchBodySnapshot({});
+
+            // Check everything is set correctly
+            assert.equal(body.recommendations[0].title, 'Dog Pictures');
+            assert.equal(body.recommendations[0].url, 'https://dogpictures.com/');
+            assert.equal(body.recommendations[0].description, null);
+            assert.equal(body.recommendations[0].excerpt, 'Because dogs are cute');
+            assert.equal(body.recommendations[0].featured_image, 'https://dogpictures.com/dog.jpg');
+            assert.equal(body.recommendations[0].favicon, 'https://dogpictures.com/favicon.ico');
+            assert.equal(body.recommendations[0].one_click_subscribe, true);
+        });
+    });
+
     describe('delete', function () {
         it('Can delete recommendation', async function () {
             const id = await addDummyRecommendation();
diff --git a/ghost/core/test/e2e-api/content/__snapshots__/pages.test.js.snap b/ghost/core/test/e2e-api/content/__snapshots__/pages.test.js.snap
index cdc3b5045ac..91bf10e8f98 100644
--- a/ghost/core/test/e2e-api/content/__snapshots__/pages.test.js.snap
+++ b/ghost/core/test/e2e-api/content/__snapshots__/pages.test.js.snap
@@ -290,6 +290,53 @@ Object {
 }
 `;
 
+exports[`Pages Content API Cannot request pages with mobiledoc or lexical fields 1: [body] 1`] = `
+Object {
+  "meta": Object {
+    "pagination": Object {
+      "limit": 15,
+      "next": null,
+      "page": 1,
+      "pages": 1,
+      "prev": null,
+      "total": 5,
+    },
+  },
+  "pages": Array [
+    Object {
+      "created_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000\\\\\\+\\\\d\\{2\\}:\\\\d\\{2\\}/,
+      "published_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000\\\\\\+\\\\d\\{2\\}:\\\\d\\{2\\}/,
+      "updated_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000\\\\\\+\\\\d\\{2\\}:\\\\d\\{2\\}/,
+      "uuid": StringMatching /\\[a-f0-9\\]\\{8\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{12\\}/,
+    },
+    Object {
+      "created_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000\\\\\\+\\\\d\\{2\\}:\\\\d\\{2\\}/,
+      "published_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000\\\\\\+\\\\d\\{2\\}:\\\\d\\{2\\}/,
+      "updated_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000\\\\\\+\\\\d\\{2\\}:\\\\d\\{2\\}/,
+      "uuid": StringMatching /\\[a-f0-9\\]\\{8\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{12\\}/,
+    },
+    Object {
+      "created_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000\\\\\\+\\\\d\\{2\\}:\\\\d\\{2\\}/,
+      "published_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000\\\\\\+\\\\d\\{2\\}:\\\\d\\{2\\}/,
+      "updated_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000\\\\\\+\\\\d\\{2\\}:\\\\d\\{2\\}/,
+      "uuid": StringMatching /\\[a-f0-9\\]\\{8\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{12\\}/,
+    },
+    Object {
+      "created_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000\\\\\\+\\\\d\\{2\\}:\\\\d\\{2\\}/,
+      "published_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000\\\\\\+\\\\d\\{2\\}:\\\\d\\{2\\}/,
+      "updated_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000\\\\\\+\\\\d\\{2\\}:\\\\d\\{2\\}/,
+      "uuid": StringMatching /\\[a-f0-9\\]\\{8\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{12\\}/,
+    },
+    Object {
+      "created_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000\\\\\\+\\\\d\\{2\\}:\\\\d\\{2\\}/,
+      "published_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000\\\\\\+\\\\d\\{2\\}:\\\\d\\{2\\}/,
+      "updated_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000\\\\\\+\\\\d\\{2\\}:\\\\d\\{2\\}/,
+      "uuid": StringMatching /\\[a-f0-9\\]\\{8\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{12\\}/,
+    },
+  ],
+}
+`;
+
 exports[`Pages Content API Cannot request pages with mobiledoc or lexical formats 1: [body] 1`] = `
 Object {
   "meta": Object {
diff --git a/ghost/core/test/e2e-api/content/__snapshots__/posts.test.js.snap b/ghost/core/test/e2e-api/content/__snapshots__/posts.test.js.snap
index 1de9cc8945d..8cd9dfd6997 100644
--- a/ghost/core/test/e2e-api/content/__snapshots__/posts.test.js.snap
+++ b/ghost/core/test/e2e-api/content/__snapshots__/posts.test.js.snap
@@ -4403,6 +4403,89 @@ Header Level 3
 }
 `;
 
+exports[`Posts Content API Cannot request mobiledoc or lexical fields 1: [body] 1`] = `
+Object {
+  "meta": Object {
+    "pagination": Object {
+      "limit": 15,
+      "next": null,
+      "page": 1,
+      "pages": 1,
+      "prev": null,
+      "total": 11,
+    },
+  },
+  "posts": Array [
+    Object {
+      "created_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000\\\\\\+\\\\d\\{2\\}:\\\\d\\{2\\}/,
+      "published_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000\\\\\\+\\\\d\\{2\\}:\\\\d\\{2\\}/,
+      "updated_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000\\\\\\+\\\\d\\{2\\}:\\\\d\\{2\\}/,
+      "uuid": StringMatching /\\[a-f0-9\\]\\{8\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{12\\}/,
+    },
+    Object {
+      "created_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000\\\\\\+\\\\d\\{2\\}:\\\\d\\{2\\}/,
+      "published_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000\\\\\\+\\\\d\\{2\\}:\\\\d\\{2\\}/,
+      "updated_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000\\\\\\+\\\\d\\{2\\}:\\\\d\\{2\\}/,
+      "uuid": StringMatching /\\[a-f0-9\\]\\{8\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{12\\}/,
+    },
+    Object {
+      "created_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000\\\\\\+\\\\d\\{2\\}:\\\\d\\{2\\}/,
+      "published_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000\\\\\\+\\\\d\\{2\\}:\\\\d\\{2\\}/,
+      "updated_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000\\\\\\+\\\\d\\{2\\}:\\\\d\\{2\\}/,
+      "uuid": StringMatching /\\[a-f0-9\\]\\{8\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{12\\}/,
+    },
+    Object {
+      "created_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000\\\\\\+\\\\d\\{2\\}:\\\\d\\{2\\}/,
+      "published_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000\\\\\\+\\\\d\\{2\\}:\\\\d\\{2\\}/,
+      "updated_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000\\\\\\+\\\\d\\{2\\}:\\\\d\\{2\\}/,
+      "uuid": StringMatching /\\[a-f0-9\\]\\{8\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{12\\}/,
+    },
+    Object {
+      "created_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000\\\\\\+\\\\d\\{2\\}:\\\\d\\{2\\}/,
+      "published_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000\\\\\\+\\\\d\\{2\\}:\\\\d\\{2\\}/,
+      "updated_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000\\\\\\+\\\\d\\{2\\}:\\\\d\\{2\\}/,
+      "uuid": StringMatching /\\[a-f0-9\\]\\{8\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{12\\}/,
+    },
+    Object {
+      "created_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000\\\\\\+\\\\d\\{2\\}:\\\\d\\{2\\}/,
+      "published_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000\\\\\\+\\\\d\\{2\\}:\\\\d\\{2\\}/,
+      "updated_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000\\\\\\+\\\\d\\{2\\}:\\\\d\\{2\\}/,
+      "uuid": StringMatching /\\[a-f0-9\\]\\{8\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{12\\}/,
+    },
+    Object {
+      "created_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000\\\\\\+\\\\d\\{2\\}:\\\\d\\{2\\}/,
+      "published_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000\\\\\\+\\\\d\\{2\\}:\\\\d\\{2\\}/,
+      "updated_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000\\\\\\+\\\\d\\{2\\}:\\\\d\\{2\\}/,
+      "uuid": StringMatching /\\[a-f0-9\\]\\{8\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{12\\}/,
+    },
+    Object {
+      "created_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000\\\\\\+\\\\d\\{2\\}:\\\\d\\{2\\}/,
+      "published_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000\\\\\\+\\\\d\\{2\\}:\\\\d\\{2\\}/,
+      "updated_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000\\\\\\+\\\\d\\{2\\}:\\\\d\\{2\\}/,
+      "uuid": StringMatching /\\[a-f0-9\\]\\{8\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{12\\}/,
+    },
+    Object {
+      "created_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000\\\\\\+\\\\d\\{2\\}:\\\\d\\{2\\}/,
+      "published_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000\\\\\\+\\\\d\\{2\\}:\\\\d\\{2\\}/,
+      "updated_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000\\\\\\+\\\\d\\{2\\}:\\\\d\\{2\\}/,
+      "uuid": StringMatching /\\[a-f0-9\\]\\{8\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{12\\}/,
+    },
+    Object {
+      "created_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000\\\\\\+\\\\d\\{2\\}:\\\\d\\{2\\}/,
+      "published_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000\\\\\\+\\\\d\\{2\\}:\\\\d\\{2\\}/,
+      "updated_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000\\\\\\+\\\\d\\{2\\}:\\\\d\\{2\\}/,
+      "uuid": StringMatching /\\[a-f0-9\\]\\{8\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{12\\}/,
+    },
+    Object {
+      "created_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000\\\\\\+\\\\d\\{2\\}:\\\\d\\{2\\}/,
+      "published_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000\\\\\\+\\\\d\\{2\\}:\\\\d\\{2\\}/,
+      "updated_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000\\\\\\+\\\\d\\{2\\}:\\\\d\\{2\\}/,
+      "uuid": StringMatching /\\[a-f0-9\\]\\{8\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{12\\}/,
+    },
+  ],
+}
+`;
+
 exports[`Posts Content API Cannot request mobiledoc or lexical formats 1: [body] 1`] = `
 Object {
   "meta": Object {
diff --git a/ghost/core/test/e2e-api/content/pages.test.js b/ghost/core/test/e2e-api/content/pages.test.js
index b7770d3533b..c302d4b6b11 100644
--- a/ghost/core/test/e2e-api/content/pages.test.js
+++ b/ghost/core/test/e2e-api/content/pages.test.js
@@ -50,6 +50,15 @@ describe('Pages Content API', function () {
             });
     });
 
+    it('Cannot request pages with mobiledoc or lexical fields', async function () {
+        await agent
+            .get(`pages/?fields=mobiledoc,lexical,published_at,created_at,updated_at,uuid`)
+            .expectStatus(200)
+            .matchBodySnapshot({
+                pages: new Array(5).fill(pageMatcher)
+            });
+    });
+
     it('Can request page', async function () {
         const res = await agent.get(`pages/${fixtureManager.get('posts', 5).id}/`)
             .expectStatus(200)
diff --git a/ghost/core/test/e2e-api/content/posts.test.js b/ghost/core/test/e2e-api/content/posts.test.js
index 02b3ef87f73..2fba0680cf1 100644
--- a/ghost/core/test/e2e-api/content/posts.test.js
+++ b/ghost/core/test/e2e-api/content/posts.test.js
@@ -84,6 +84,15 @@ describe('Posts Content API', function () {
             });
     });
 
+    it('Cannot request mobiledoc or lexical fields', async function () {
+        await agent
+            .get(`posts/?fields=mobiledoc,lexical,published_at,created_at,updated_at,uuid`)
+            .expectStatus(200)
+            .matchBodySnapshot({
+                posts: new Array(11).fill(postMatcher)
+            });
+    });
+
     it('Can filter posts by tag', async function () {
         const res = await agent.get('posts/?filter=tag:kitchen-sink,featured:true&include=tags')
             .expectStatus(200)
diff --git a/ghost/core/test/e2e-api/members/__snapshots__/middleware.test.js.snap b/ghost/core/test/e2e-api/members/__snapshots__/middleware.test.js.snap
index 44872d36482..7cf8977a3dd 100644
--- a/ghost/core/test/e2e-api/members/__snapshots__/middleware.test.js.snap
+++ b/ghost/core/test/e2e-api/members/__snapshots__/middleware.test.js.snap
@@ -19,12 +19,14 @@ Object {
       "id": StringMatching /\\[a-f0-9\\]\\{24\\}/,
       "name": "Default Newsletter",
       "sort_order": 0,
+      "uuid": StringMatching /\\[a-f0-9\\]\\{8\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{12\\}/,
     },
     Object {
       "description": null,
       "id": StringMatching /\\[a-f0-9\\]\\{24\\}/,
       "name": "Weekly newsletter",
       "sort_order": 2,
+      "uuid": StringMatching /\\[a-f0-9\\]\\{8\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{12\\}/,
     },
   ],
   "paid": false,
@@ -38,7 +40,7 @@ exports[`Comments API when authenticated can get member data 2: [headers] 1`] =
 Object {
   "access-control-allow-origin": "*",
   "cache-control": "no-cache, private, no-store, must-revalidate, max-stale=0, post-check=0, pre-check=0",
-  "content-length": "529",
+  "content-length": "621",
   "content-type": "application/json; charset=utf-8",
   "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
   "vary": "Accept-Encoding",
@@ -144,12 +146,14 @@ Object {
       "id": StringMatching /\\[a-f0-9\\]\\{24\\}/,
       "name": "Default Newsletter",
       "sort_order": 0,
+      "uuid": StringMatching /\\[a-f0-9\\]\\{8\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{12\\}/,
     },
     Object {
       "description": null,
       "id": StringMatching /\\[a-f0-9\\]\\{24\\}/,
       "name": "Weekly newsletter",
       "sort_order": 2,
+      "uuid": StringMatching /\\[a-f0-9\\]\\{8\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{12\\}/,
     },
   ],
   "paid": false,
@@ -163,7 +167,7 @@ exports[`Comments API when authenticated can update comment notifications 2: [he
 Object {
   "access-control-allow-origin": "*",
   "cache-control": "no-cache, private, no-store, must-revalidate, max-stale=0, post-check=0, pre-check=0",
-  "content-length": "541",
+  "content-length": "633",
   "content-type": "application/json; charset=utf-8",
   "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
   "vary": "Accept-Encoding",
@@ -182,12 +186,14 @@ Object {
       "id": StringMatching /\\[a-f0-9\\]\\{24\\}/,
       "name": "Default Newsletter",
       "sort_order": 0,
+      "uuid": StringMatching /\\[a-f0-9\\]\\{8\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{12\\}/,
     },
     Object {
       "description": null,
       "id": StringMatching /\\[a-f0-9\\]\\{24\\}/,
       "name": "Weekly newsletter",
       "sort_order": 2,
+      "uuid": StringMatching /\\[a-f0-9\\]\\{8\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{12\\}/,
     },
   ],
   "status": "free",
@@ -199,7 +205,7 @@ exports[`Comments API when authenticated can update comment notifications 4: [he
 Object {
   "access-control-allow-origin": "*",
   "cache-control": "no-cache, private, no-store, must-revalidate, max-stale=0, post-check=0, pre-check=0",
-  "content-length": "354",
+  "content-length": "446",
   "content-type": "application/json; charset=utf-8",
   "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
   "vary": "Accept-Encoding",
@@ -226,12 +232,14 @@ Object {
       "id": StringMatching /\\[a-f0-9\\]\\{24\\}/,
       "name": "Default Newsletter",
       "sort_order": 0,
+      "uuid": StringMatching /\\[a-f0-9\\]\\{8\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{12\\}/,
     },
     Object {
       "description": null,
       "id": StringMatching /\\[a-f0-9\\]\\{24\\}/,
       "name": "Weekly newsletter",
       "sort_order": 2,
+      "uuid": StringMatching /\\[a-f0-9\\]\\{8\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{12\\}/,
     },
   ],
   "paid": false,
@@ -245,7 +253,7 @@ exports[`Comments API when authenticated can update member expertise 2: [headers
 Object {
   "access-control-allow-origin": "*",
   "cache-control": "no-cache, private, no-store, must-revalidate, max-stale=0, post-check=0, pre-check=0",
-  "content-length": "542",
+  "content-length": "634",
   "content-type": "application/json; charset=utf-8",
   "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
   "vary": "Accept-Encoding",
@@ -272,12 +280,14 @@ Object {
       "id": StringMatching /\\[a-f0-9\\]\\{24\\}/,
       "name": "Default Newsletter",
       "sort_order": 0,
+      "uuid": StringMatching /\\[a-f0-9\\]\\{8\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{12\\}/,
     },
     Object {
       "description": null,
       "id": StringMatching /\\[a-f0-9\\]\\{24\\}/,
       "name": "Weekly newsletter",
       "sort_order": 2,
+      "uuid": StringMatching /\\[a-f0-9\\]\\{8\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{12\\}/,
     },
   ],
   "paid": false,
@@ -291,7 +301,7 @@ exports[`Comments API when authenticated can update name 2: [headers] 1`] = `
 Object {
   "access-control-allow-origin": "*",
   "cache-control": "no-cache, private, no-store, must-revalidate, max-stale=0, post-check=0, pre-check=0",
-  "content-length": "540",
+  "content-length": "632",
   "content-type": "application/json; charset=utf-8",
   "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
   "vary": "Accept-Encoding",
@@ -318,12 +328,14 @@ Object {
       "id": StringMatching /\\[a-f0-9\\]\\{24\\}/,
       "name": "Default Newsletter",
       "sort_order": 0,
+      "uuid": StringMatching /\\[a-f0-9\\]\\{8\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{12\\}/,
     },
     Object {
       "description": null,
       "id": StringMatching /\\[a-f0-9\\]\\{24\\}/,
       "name": "Weekly newsletter",
       "sort_order": 2,
+      "uuid": StringMatching /\\[a-f0-9\\]\\{8\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{12\\}/,
     },
   ],
   "paid": false,
@@ -337,7 +349,7 @@ exports[`Comments API when authenticated trims whitespace from expertise 2: [hea
 Object {
   "access-control-allow-origin": "*",
   "cache-control": "no-cache, private, no-store, must-revalidate, max-stale=0, post-check=0, pre-check=0",
-  "content-length": "531",
+  "content-length": "623",
   "content-type": "application/json; charset=utf-8",
   "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
   "vary": "Accept-Encoding",
@@ -356,6 +368,7 @@ Object {
       "id": StringMatching /\\[a-f0-9\\]\\{24\\}/,
       "name": "Daily newsletter",
       "sort_order": 1,
+      "uuid": StringMatching /\\[a-f0-9\\]\\{8\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{12\\}/,
     },
   ],
   "status": "free",
@@ -367,7 +380,7 @@ exports[`Comments API when not authenticated but enabled can update comment noti
 Object {
   "access-control-allow-origin": "*",
   "cache-control": "no-cache, private, no-store, must-revalidate, max-stale=0, post-check=0, pre-check=0",
-  "content-length": "253",
+  "content-length": "299",
   "content-type": "application/json; charset=utf-8",
   "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
   "vary": "Accept-Encoding",
diff --git a/ghost/core/test/e2e-api/members/middleware.test.js b/ghost/core/test/e2e-api/members/middleware.test.js
index 8f97b479660..c5aa4579980 100644
--- a/ghost/core/test/e2e-api/members/middleware.test.js
+++ b/ghost/core/test/e2e-api/members/middleware.test.js
@@ -12,7 +12,8 @@ const memberMatcher = (newslettersCount) => {
         created_at: anyISODateTime,
         newsletters: new Array(newslettersCount).fill(
             {
-                id: anyObjectId
+                id: anyObjectId,
+                uuid: anyUuid
             }
         )
     };
@@ -23,7 +24,8 @@ const buildMemberMatcher = (newslettersCount) => {
         uuid: anyUuid,
         newsletters: new Array(newslettersCount).fill(
             {
-                id: anyObjectId
+                id: anyObjectId,
+                uuid: anyUuid
             }
         )
     };
diff --git a/ghost/core/test/e2e-api/members/signin.test.js b/ghost/core/test/e2e-api/members/signin.test.js
index 7ef02f0e303..aaa238bbecb 100644
--- a/ghost/core/test/e2e-api/members/signin.test.js
+++ b/ghost/core/test/e2e-api/members/signin.test.js
@@ -3,6 +3,7 @@ const models = require('../../../core/server/models');
 const assert = require('assert/strict');
 require('should');
 const sinon = require('sinon');
+const members = require('../../../core/server/services/members');
 
 let membersAgent, membersService;
 
@@ -64,7 +65,7 @@ describe('Members Signin', function () {
 
         await membersAgent.get(`/?token=${token}&action=signup`)
             .expectStatus(302)
-            .expectHeader('Location', /\/welcome-free\/$/)
+            .expectHeader('Location', /\/welcome-free\/\?success=true&action=signup$/)
             .expectHeader('Set-Cookie', /members-ssr.*/);
     });
 
@@ -75,7 +76,7 @@ describe('Members Signin', function () {
 
         await membersAgent.get(`/?token=${token}&action=signup-paid`)
             .expectStatus(302)
-            .expectHeader('Location', /\/welcome-paid\/$/)
+            .expectHeader('Location', /\/welcome-paid\/\?success=true&action=signup$/)
             .expectHeader('Set-Cookie', /members-ssr.*/);
     });
 
@@ -86,10 +87,36 @@ describe('Members Signin', function () {
 
         await membersAgent.get(`/?token=${token}&action=subscribe`)
             .expectStatus(302)
-            .expectHeader('Location', /\/welcome-free\/$/)
+            .expectHeader('Location', /\/welcome-free\/\?success=true&action=signup$/)
             .expectHeader('Set-Cookie', /members-ssr.*/);
     });
 
+    it('Will redirect to an external welcome page for subscribe', async function () {
+        // Alter the product welcome page to an external URL
+        const freeProduct = await members.api.productRepository.get({slug: 'free'});
+        await members.api.productRepository.update({
+            id: freeProduct.id,
+            welcome_page_url: 'https://externalsite.ghost/welcome/'
+        });
+
+        try {
+            const magicLink = await membersService.api.getMagicLink('member1@test.com', 'signup');
+            const magicLinkUrl = new URL(magicLink);
+            const token = magicLinkUrl.searchParams.get('token');
+
+            await membersAgent.get(`/?token=${token}&action=subscribe`)
+                .expectStatus(302)
+                .expectHeader('Location', 'https://externalsite.ghost/welcome/') // no query params added
+                .expectHeader('Set-Cookie', /members-ssr.*/);
+        } finally {
+            // Change it back
+            await members.api.productRepository.update({
+                id: freeProduct.id,
+                welcome_page_url: freeProduct.get('welcome_page_url')
+            });
+        }
+    });
+
     it('Will create a new member on signup', async function () {
         const email = 'not-existent-member@test.com';
         const magicLink = await membersService.api.getMagicLink(email, 'signup');
@@ -98,7 +125,7 @@ describe('Members Signin', function () {
 
         await membersAgent.get(`/?token=${token}&action=signup`)
             .expectStatus(302)
-            .expectHeader('Location', /\/welcome-free\/$/)
+            .expectHeader('Location', /\/welcome-free\/\?success=true&action=signup$/)
             .expectHeader('Set-Cookie', /members-ssr.*/);
 
         const member = await getMemberByEmail(email);
@@ -129,7 +156,7 @@ describe('Members Signin', function () {
 
         await membersAgent.get(`/?token=${token}&action=signup`)
             .expectStatus(302)
-            .expectHeader('Location', /\/welcome-free\/$/)
+            .expectHeader('Location', /\/welcome-free\/\?success=true&action=signup$/)
             .expectHeader('Set-Cookie', /members-ssr.*/);
     });
 
@@ -173,7 +200,7 @@ describe('Members Signin', function () {
             // Use a first time
             await membersAgent.get(`/?token=${token}&action=signup`)
                 .expectStatus(302)
-                .expectHeader('Location', /\/welcome-free\/$/)
+                .expectHeader('Location', /\/welcome-free\/\?success=true&action=signup$/)
                 .expectHeader('Set-Cookie', /members-ssr.*/);
 
             // Fetch token in the database
@@ -189,7 +216,7 @@ describe('Members Signin', function () {
 
             await membersAgent.get(`/?token=${token}&action=signup`)
                 .expectStatus(302)
-                .expectHeader('Location', /\/welcome-free\/$/)
+                .expectHeader('Location', /\/welcome-free\/\?success=true&action=signup$/)
                 .expectHeader('Set-Cookie', /members-ssr.*/);
 
             await model.refresh();
@@ -226,17 +253,17 @@ describe('Members Signin', function () {
             // Use a first time
             await membersAgent.get(`/?token=${token}&action=signup`)
                 .expectStatus(302)
-                .expectHeader('Location', /\/welcome-free\/$/)
+                .expectHeader('Location', /\/welcome-free\/\?success=true&action=signup$/)
                 .expectHeader('Set-Cookie', /members-ssr.*/);
 
             await membersAgent.get(`/?token=${token}&action=signup`)
                 .expectStatus(302)
-                .expectHeader('Location', /\/welcome-free\/$/)
+                .expectHeader('Location', /\/welcome-free\/\?success=true&action=signup$/)
                 .expectHeader('Set-Cookie', /members-ssr.*/);
 
             await membersAgent.get(`/?token=${token}&action=signup`)
                 .expectStatus(302)
-                .expectHeader('Location', /\/welcome-free\/$/)
+                .expectHeader('Location', /\/welcome-free\/\?success=true&action=signup$/)
                 .expectHeader('Set-Cookie', /members-ssr.*/);
 
             // Fetch token in the database
@@ -534,7 +561,7 @@ describe('Members Signin', function () {
 
             await membersAgent.get(`/?token=${token}&action=signup`)
                 .expectStatus(302)
-                .expectHeader('Location', /\/welcome-free\/$/)
+                .expectHeader('Location', /\/welcome-free\/\?success=true&action=signup$/)
                 .expectHeader('Set-Cookie', /members-ssr.*/);
 
             const member = await getMemberByEmail(email);
diff --git a/ghost/core/test/e2e-browser/admin/publishing.spec.js b/ghost/core/test/e2e-browser/admin/publishing.spec.js
index d1393872e44..b3c45482973 100644
--- a/ghost/core/test/e2e-browser/admin/publishing.spec.js
+++ b/ghost/core/test/e2e-browser/admin/publishing.spec.js
@@ -583,11 +583,11 @@ test.describe('Updating post access', () => {
 
         await page.getByTestId('timezone').getByRole('button', {name: 'Edit'}).click();
         await page.getByTestId('timezone-select').click();
-        await page.locator('[data-testid="select-option"]', {hasText: 'Kamchatka'}).click();
+        await page.locator('[data-testid="select-option"]', {hasText: 'Tokyo'}).click();
 
         await page.getByTestId('timezone').getByRole('button', {name: 'Save'}).click();
         await expect(page.getByTestId('timezone-select')).toBeHidden();
-        await expect(page.getByTestId('timezone')).toContainText('(GMT +12:00) Fiji, Kamchatka, Marshall Is.');
+        await expect(page.getByTestId('timezone')).toContainText('(GMT +9:00) Osaka, Sapporo, Tokyo');
 
         await page.getByTestId('exit-settings').click();
         await page.locator('[data-test-nav="posts"]').click();
@@ -595,9 +595,9 @@ test.describe('Updating post access', () => {
 
         await openPostSettingsMenu(page);
 
-        await expect(page.locator('[data-test-date-time-picker-timezone]')).toHaveText('+12');
-        await expect(page.locator('[data-test-date-time-picker-time-input]')).toHaveValue('00:00');
-        await expect(page.locator('[data-test-date-time-picker-date-input]')).toHaveValue(/-16$/);
+        await expect(page.locator('[data-test-date-time-picker-timezone]')).toHaveText('JST');
+        await expect(page.locator('[data-test-date-time-picker-time-input]')).toHaveValue('21:00');
+        await expect(page.locator('[data-test-date-time-picker-date-input]')).toHaveValue(/-15$/);
     });
 
     test('default recipient settings - usually nobody', async ({page}) => {
diff --git a/ghost/core/test/e2e-browser/utils/e2e-browser-utils.js b/ghost/core/test/e2e-browser/utils/e2e-browser-utils.js
index aecdea200e2..42470903563 100644
--- a/ghost/core/test/e2e-browser/utils/e2e-browser-utils.js
+++ b/ghost/core/test/e2e-browser/utils/e2e-browser-utils.js
@@ -154,31 +154,6 @@ const deleteAllMembers = async (page) => {
     }
 };
 
-/**
- * Archive all tiers, 1 by 1, using the UI
- * @param {import('@playwright/test').Page} page
- */
-const archiveAllTiers = async (page) => {
-    // Navigate to the member settings
-    await page.locator('[data-test-nav="settings"]').click();
-    await page.locator('[data-test-nav="members-membership"]').click();
-
-    // Tiers request can take time, so waiting until there is no connections before interacting with them
-    await page.waitForLoadState('networkidle');
-
-    // Expand the premium tier list
-    await page.locator('[data-test-toggle-pub-info]').click();
-
-    // Archive if already exists
-    while (await page.locator('.gh-tier-card').first().isVisible()) {
-        const tierCard = page.locator('.gh-tier-card').first();
-        await tierCard.locator('.gh-tier-card-actions-button').click();
-        await tierCard.getByRole('button', {name: 'Archive'}).click();
-        await page.locator('.modal-content').getByRole('button', {name: 'Archive'}).click();
-        await page.locator('.modal-content').waitFor({state: 'detached', timeout: 1000});
-    }
-};
-
 /**
  * Allows impersonating a member by copying the impersonate link
  * opens site with member logged in via the link
@@ -528,7 +503,6 @@ module.exports = {
     setupMailgun,
     deleteAllMembers,
     createTier,
-    archiveAllTiers,
     createOffer,
     createMember,
     createPostDraft,
diff --git a/ghost/core/test/e2e-frontend/members.test.js b/ghost/core/test/e2e-frontend/members.test.js
index 44f014c8ab7..5ffe92168f5 100644
--- a/ghost/core/test/e2e-frontend/members.test.js
+++ b/ghost/core/test/e2e-frontend/members.test.js
@@ -194,9 +194,10 @@ describe('Front-end members behavior', function () {
             getJsonResponse.newsletters.should.have.length(1);
 
             // NOTE: these should be snapshots not code
-            Object.keys(getJsonResponse.newsletters[0]).should.have.length(4);
+            Object.keys(getJsonResponse.newsletters[0]).should.have.length(5);
             getJsonResponse.newsletters[0].should.have.properties([
                 'id',
+                'uuid',
                 'name',
                 'description',
                 'sort_order'
@@ -231,9 +232,10 @@ describe('Front-end members behavior', function () {
             restoreJsonResponse.should.not.have.property('id');
             restoreJsonResponse.newsletters.should.have.length(1);
             // @NOTE: this seems like too much exposed information, needs a review
-            Object.keys(restoreJsonResponse.newsletters[0]).should.have.length(4);
+            Object.keys(restoreJsonResponse.newsletters[0]).should.have.length(5);
             restoreJsonResponse.newsletters[0].should.have.properties([
                 'id',
+                'uuid',
                 'name',
                 'description',
                 'sort_order'
@@ -663,9 +665,10 @@ describe('Front-end members behavior', function () {
                 memberData.newsletters.should.have.length(1);
 
                 // @NOTE: this should be a snapshot test not code
-                Object.keys(memberData.newsletters[0]).should.have.length(4);
+                Object.keys(memberData.newsletters[0]).should.have.length(5);
                 memberData.newsletters[0].should.have.properties([
                     'id',
+                    'uuid',
                     'name',
                     'description',
                     'sort_order'
diff --git a/ghost/core/test/e2e-server/services/__snapshots__/recommendation-emails.test.js.snap b/ghost/core/test/e2e-server/services/__snapshots__/recommendation-emails.test.js.snap
index c1ac41b64ff..d603e456bcc 100644
--- a/ghost/core/test/e2e-server/services/__snapshots__/recommendation-emails.test.js.snap
+++ b/ghost/core/test/e2e-server/services/__snapshots__/recommendation-emails.test.js.snap
@@ -108,6 +108,13 @@ exports[`Incoming Recommendation Emails Sends a different email if we receive a
         padding-left: 20px;
         border-left: 3px solid #DDE1E5;
       }
+      .recommendation-card--outlook {
+    	margin: 0;
+        padding: 0;
+        width: 100%;
+        border: 1px solid #F9F9FA;
+        background: #F9F9FA;
+      }
     </style>
   </head>
   <body style=\\"background-color: #ffffff; font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; -webkit-font-smoothing: antialiased; font-size: 14px; line-height: 1.5em; margin: 0; padding: 0; -ms-text-size-adjust: 100%; -webkit-text-size-adjust: 100%;\\">
@@ -132,35 +139,33 @@ exports[`Incoming Recommendation Emails Sends a different email if we receive a
                           <p style=\\"font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 16px; color: #3A464C; font-weight: normal; margin: 0; line-height: 25px; margin-bottom: 16px;\\">A site you’re recommending is now <strong>recommending you back</strong>:</p>
 
                         <!--[if !mso !vml]-->
-                        <figure style=\\"margin:0 0 1.5em;padding:0;width:100%;\\">
-                          <a style=\\"display:flex;min-height:110px;font-family:-apple-system,BlinkMacSystemFont,'Segoe UI',Roboto,Oxygen,Ubuntu,Cantarell,'Open Sans','Helvetica Neue',sans-serif;background:#F9F9FA;border-radius:3px;border:1px solid #F9F9FA;color:#15171a;text-decoration:none\\" href=\\"https://www.otherghostsite.com/\\">
+                        <figure style=\\"margin:0 0 1.5em;padding:0;width:100%;background:#F9F9FA;\\">
+                          <a style=\\"display:flex;font-family:-apple-system,BlinkMacSystemFont,'Segoe UI',Roboto,Oxygen,Ubuntu,Cantarell,'Open Sans','Helvetica Neue',sans-serif;background:#F9F9FA;border-radius:3px;border:1px solid #F9F9FA;color:#15171a;text-decoration:none\\" href=\\"https://www.otherghostsite.com/\\">
                             <div style=\\"display:inline-block; width:100%; padding:20px\\">
                               <div style=\\"color:#15212a;font-size:13px;font-weight:400\\">
                                 
                                 <div style=\\"color:#15212a;font-size:16px;line-height:1.3em;font-weight:600\\">Other Ghost Site</div>
                               </div>
-                              <div class=\\"kg-bookmark-description\\" style=\\"display:-webkit-box;overflow-y:hidden;margin-top:6px;max-height:40px;color:#738a94;font-size:13px;line-height:1.5em;font-weight:400;-webkit-line-clamp: 2; -webkit-box-orient: vertical;\\"></div>
                             </div>
                           </a>
                         </figure>
                         <!--[endif]-->
 
                         <!--[if vml]>
-                        <table style=\\"border-collapse: collapse; border-spacing: 0; margin: 0; padding: 0; width: 100%; border: 1px solid #f9f9fa; background: #f9f9fa; font-family: -apple-system, BlinkMacSystemFont, \\"Segoe UI\\", Roboto, Oxygen, Ubuntu, Cantarell, \\"Open Sans\\", \\"Helvetica Neue\\", sans-serif;\\">
+                        <table style=\\"border-collapse: collapse; border-spacing: 0; margin: 0; padding: 0; width: 100%; border: 1px solid #F9F9FA; font-family: -apple-system, BlinkMacSystemFont, \\"Segoe UI\\", Roboto, Oxygen, Ubuntu, Cantarell, \\"Open Sans\\", \\"Helvetica Neue\\", sans-serif; background-color:#F9F9FA;\\" class=\\"recommendation-card--outlook\\">
                             <tr>
                                 <td width=\\"100%\\" style=\\"padding: 20px;background-color:#F9F9FA;\\">
                                     <table style=\\"margin: 0; padding: 0; border-collapse: collapse; border-spacing: 0;\\">
                                         <tr>
-                                            <td style=\\"padding-bottom: 12px;\\">
+                                            <td>
                                               <table style=\\"margin: 0; padding: 0; border-collapse: collapse; border-spacing: 0;\\">
                                                   <tr>
-                                                      <td><a style=\\"color: #15212A; font-size: 15px; line-height: 1.5em; font-weight: 600; text-decoration: none;\\" href=\\"\\"></a></td>
+                                                      <td><a style=\\"color: #15212A; font-size: 15px; line-height: 1.5em; font-weight: 600; text-decoration: none;\\" href=\\"https://www.otherghostsite.com/\\">Other Ghost Site</a></td>
                                                   </tr>
                                               </table>
                                             </td>
                                         </tr>
                                         <tr>
-                                            <td><div><a href=\\"\\" style=\\"margin-top: 12px; color: #738a94; font-size: 13px; line-height: 1.5em; font-weight: 400;text-decoration: none;\\"></a></div></td>
                                         </tr>
                                     </table>
                                 </td>
@@ -347,6 +352,13 @@ exports[`Incoming Recommendation Emails Sends an email if we receive a recommend
         padding-left: 20px;
         border-left: 3px solid #DDE1E5;
       }
+      .recommendation-card--outlook {
+    	margin: 0;
+        padding: 0;
+        width: 100%;
+        border: 1px solid #F9F9FA;
+        background: #F9F9FA;
+      }
     </style>
   </head>
   <body style=\\"background-color: #ffffff; font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; -webkit-font-smoothing: antialiased; font-size: 14px; line-height: 1.5em; margin: 0; padding: 0; -ms-text-size-adjust: 100%; -webkit-text-size-adjust: 100%;\\">
@@ -371,35 +383,33 @@ exports[`Incoming Recommendation Emails Sends an email if we receive a recommend
                           <p style=\\"font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 16px; color: #3A464C; font-weight: normal; margin: 0; line-height: 25px; margin-bottom: 16px;\\">Other Ghost Site is <strong>recommending you</strong> to their audience. Now, every time someone new signs up on their site, they’ll see an option to check out Ghost as well.</p>
 
                         <!--[if !mso !vml]-->
-                        <figure style=\\"margin:0 0 1.5em;padding:0;width:100%;\\">
-                          <a style=\\"display:flex;min-height:110px;font-family:-apple-system,BlinkMacSystemFont,'Segoe UI',Roboto,Oxygen,Ubuntu,Cantarell,'Open Sans','Helvetica Neue',sans-serif;background:#F9F9FA;border-radius:3px;border:1px solid #F9F9FA;color:#15171a;text-decoration:none\\" href=\\"https://www.otherghostsite.com/\\">
+                        <figure style=\\"margin:0 0 1.5em;padding:0;width:100%;background:#F9F9FA;\\">
+                          <a style=\\"display:flex;font-family:-apple-system,BlinkMacSystemFont,'Segoe UI',Roboto,Oxygen,Ubuntu,Cantarell,'Open Sans','Helvetica Neue',sans-serif;background:#F9F9FA;border-radius:3px;border:1px solid #F9F9FA;color:#15171a;text-decoration:none\\" href=\\"https://www.otherghostsite.com/\\">
                             <div style=\\"display:inline-block; width:100%; padding:20px\\">
                               <div style=\\"color:#15212a;font-size:13px;font-weight:400\\">
                                 
                                 <div style=\\"color:#15212a;font-size:16px;line-height:1.3em;font-weight:600\\">Other Ghost Site</div>
                               </div>
-                              <div class=\\"kg-bookmark-description\\" style=\\"display:-webkit-box;overflow-y:hidden;margin-top:6px;max-height:40px;color:#738a94;font-size:13px;line-height:1.5em;font-weight:400;-webkit-line-clamp: 2; -webkit-box-orient: vertical;\\"></div>
                             </div>
                           </a>
                         </figure>
                         <!--[endif]-->
 
                         <!--[if vml]>
-                        <table style=\\"border-collapse: collapse; border-spacing: 0; margin: 0; padding: 0; width: 100%; border: 1px solid #f9f9fa; background: #f9f9fa; font-family: -apple-system, BlinkMacSystemFont, \\"Segoe UI\\", Roboto, Oxygen, Ubuntu, Cantarell, \\"Open Sans\\", \\"Helvetica Neue\\", sans-serif;\\">
+                        <table style=\\"border-collapse: collapse; border-spacing: 0; margin: 0; padding: 0; width: 100%; border: 1px solid #F9F9FA; font-family: -apple-system, BlinkMacSystemFont, \\"Segoe UI\\", Roboto, Oxygen, Ubuntu, Cantarell, \\"Open Sans\\", \\"Helvetica Neue\\", sans-serif; background-color:#F9F9FA;\\" class=\\"recommendation-card--outlook\\">
                             <tr>
                                 <td width=\\"100%\\" style=\\"padding: 20px;background-color:#F9F9FA;\\">
                                     <table style=\\"margin: 0; padding: 0; border-collapse: collapse; border-spacing: 0;\\">
                                         <tr>
-                                            <td style=\\"padding-bottom: 12px;\\">
+                                            <td>
                                               <table style=\\"margin: 0; padding: 0; border-collapse: collapse; border-spacing: 0;\\">
                                                   <tr>
-                                                      <td><a style=\\"color: #15212A; font-size: 15px; line-height: 1.5em; font-weight: 600; text-decoration: none;\\" href=\\"\\"></a></td>
+                                                      <td><a style=\\"color: #15212A; font-size: 15px; line-height: 1.5em; font-weight: 600; text-decoration: none;\\" href=\\"https://www.otherghostsite.com/\\">Other Ghost Site</a></td>
                                                   </tr>
                                               </table>
                                             </td>
                                         </tr>
                                         <tr>
-                                            <td><div><a href=\\"\\" style=\\"margin-top: 12px; color: #738a94; font-size: 13px; line-height: 1.5em; font-weight: 400;text-decoration: none;\\"></a></div></td>
                                         </tr>
                                     </table>
                                 </td>
@@ -568,6 +578,13 @@ exports[`Incoming Recommendation Emails Sends an email if we receive a recommend
         padding-left: 20px;
         border-left: 3px solid #DDE1E5;
       }
+      .recommendation-card--outlook {
+    	margin: 0;
+        padding: 0;
+        width: 100%;
+        border: 1px solid #F9F9FA;
+        background: #F9F9FA;
+      }
     </style>
   </head>
   <body style=\\"background-color: #ffffff; font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; -webkit-font-smoothing: antialiased; font-size: 14px; line-height: 1.5em; margin: 0; padding: 0; -ms-text-size-adjust: 100%; -webkit-text-size-adjust: 100%;\\">
@@ -592,35 +609,33 @@ exports[`Incoming Recommendation Emails Sends an email if we receive a recommend
                           <p style=\\"font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 16px; color: #3A464C; font-weight: normal; margin: 0; line-height: 25px; margin-bottom: 16px;\\">Other Ghost Site is <strong>recommending you</strong> to their audience. Now, every time someone new signs up on their site, they’ll see an option to check out Ghost as well.</p>
 
                         <!--[if !mso !vml]-->
-                        <figure style=\\"margin:0 0 1.5em;padding:0;width:100%;\\">
-                          <a style=\\"display:flex;min-height:110px;font-family:-apple-system,BlinkMacSystemFont,'Segoe UI',Roboto,Oxygen,Ubuntu,Cantarell,'Open Sans','Helvetica Neue',sans-serif;background:#F9F9FA;border-radius:3px;border:1px solid #F9F9FA;color:#15171a;text-decoration:none\\" href=\\"https://www.otherghostsite.com/\\">
+                        <figure style=\\"margin:0 0 1.5em;padding:0;width:100%;background:#F9F9FA;\\">
+                          <a style=\\"display:flex;font-family:-apple-system,BlinkMacSystemFont,'Segoe UI',Roboto,Oxygen,Ubuntu,Cantarell,'Open Sans','Helvetica Neue',sans-serif;background:#F9F9FA;border-radius:3px;border:1px solid #F9F9FA;color:#15171a;text-decoration:none\\" href=\\"https://www.otherghostsite.com/\\">
                             <div style=\\"display:inline-block; width:100%; padding:20px\\">
                               <div style=\\"color:#15212a;font-size:13px;font-weight:400\\">
                                 
                                 <div style=\\"color:#15212a;font-size:16px;line-height:1.3em;font-weight:600\\">Other Ghost Site</div>
                               </div>
-                              <div class=\\"kg-bookmark-description\\" style=\\"display:-webkit-box;overflow-y:hidden;margin-top:6px;max-height:40px;color:#738a94;font-size:13px;line-height:1.5em;font-weight:400;-webkit-line-clamp: 2; -webkit-box-orient: vertical;\\"></div>
                             </div>
                           </a>
                         </figure>
                         <!--[endif]-->
 
                         <!--[if vml]>
-                        <table style=\\"border-collapse: collapse; border-spacing: 0; margin: 0; padding: 0; width: 100%; border: 1px solid #f9f9fa; background: #f9f9fa; font-family: -apple-system, BlinkMacSystemFont, \\"Segoe UI\\", Roboto, Oxygen, Ubuntu, Cantarell, \\"Open Sans\\", \\"Helvetica Neue\\", sans-serif;\\">
+                        <table style=\\"border-collapse: collapse; border-spacing: 0; margin: 0; padding: 0; width: 100%; border: 1px solid #F9F9FA; font-family: -apple-system, BlinkMacSystemFont, \\"Segoe UI\\", Roboto, Oxygen, Ubuntu, Cantarell, \\"Open Sans\\", \\"Helvetica Neue\\", sans-serif; background-color:#F9F9FA;\\" class=\\"recommendation-card--outlook\\">
                             <tr>
                                 <td width=\\"100%\\" style=\\"padding: 20px;background-color:#F9F9FA;\\">
                                     <table style=\\"margin: 0; padding: 0; border-collapse: collapse; border-spacing: 0;\\">
                                         <tr>
-                                            <td style=\\"padding-bottom: 12px;\\">
+                                            <td>
                                               <table style=\\"margin: 0; padding: 0; border-collapse: collapse; border-spacing: 0;\\">
                                                   <tr>
-                                                      <td><a style=\\"color: #15212A; font-size: 15px; line-height: 1.5em; font-weight: 600; text-decoration: none;\\" href=\\"\\"></a></td>
+                                                      <td><a style=\\"color: #15212A; font-size: 15px; line-height: 1.5em; font-weight: 600; text-decoration: none;\\" href=\\"https://www.otherghostsite.com/\\">Other Ghost Site</a></td>
                                                   </tr>
                                               </table>
                                             </td>
                                         </tr>
                                         <tr>
-                                            <td><div><a href=\\"\\" style=\\"margin-top: 12px; color: #738a94; font-size: 13px; line-height: 1.5em; font-weight: 400;text-decoration: none;\\"></a></div></td>
                                         </tr>
                                     </table>
                                 </td>
diff --git a/ghost/core/test/integration/services/email-service/__snapshots__/batch-sending.test.js.snap b/ghost/core/test/integration/services/email-service/__snapshots__/batch-sending.test.js.snap
index 109827bb9b4..5d2e9e3e60c 100644
--- a/ghost/core/test/integration/services/email-service/__snapshots__/batch-sending.test.js.snap
+++ b/ghost/core/test/integration/services/email-service/__snapshots__/batch-sending.test.js.snap
@@ -84,8 +84,7 @@ Object {
   table.body p,
 table.body ul,
 table.body ol,
-table.body td,
-table.body span {
+table.body td {
     font-size: 16px !important;
   }
 
@@ -201,35 +200,30 @@ table.body .feedback-button-mobile-text {
   }
 
   table.body .latest-posts-header {
-    font-size: 14px !important;
-  }
-
-  table.body .latest-post-img {
-    display: none !important;
-  }
-
-  table.body .latest-post-img-mobile {
-    display: inline-block !important;
-    width: 100%;
+    font-size: 12px !important;
   }
 
   table.body .latest-post-title {
     display: inline-block !important;
     width: 100%;
-    padding-right: 0 !important;
-    padding-bottom: 8px !important;
+    padding-right: 8px !important;
   }
 
   table.body .latest-post h4,
 table.body .latest-post h4 span {
-    padding: 4px 0 !important;
-    font-size: 18px !important;
+    padding: 4px 0 6px !important;
+    font-size: 15px !important;
   }
 
-  table.body .latest-post p,
-table.body .latest-post p span {
+  table.body .latest-post-excerpt,
+table.body .latest-post-excerpt a,
+table.body .latest-post-excerpt span {
     font-size: 13px !important;
-    line-height: 1.25em;
+    line-height: 1.2 !important;
+  }
+
+  table.body .latest-post-excerpt span {
+    display: none !important;
   }
 
   table.body .subscription-box h3 {
@@ -274,7 +268,8 @@ table.body .manage-subscription {
     line-height: 1.3em !important;
   }
 
-  table.body h2 {
+  table.body h2,
+table.body h2 span {
     font-size: 26px !important;
     line-height: 1.22em !important;
   }
@@ -320,11 +315,6 @@ table.body .manage-subscription {
   table.body hr {
     margin: 2em 0 !important;
   }
-
-  table.body figcaption,
-table.body figcaption a {
-    font-size: 13px !important;
-  }
 }
 @media all {
   .subscription-details p.hidden {
@@ -708,8 +698,7 @@ Object {
   table.body p,
 table.body ul,
 table.body ol,
-table.body td,
-table.body span {
+table.body td {
     font-size: 16px !important;
   }
 
@@ -825,35 +814,30 @@ table.body .feedback-button-mobile-text {
   }
 
   table.body .latest-posts-header {
-    font-size: 14px !important;
-  }
-
-  table.body .latest-post-img {
-    display: none !important;
-  }
-
-  table.body .latest-post-img-mobile {
-    display: inline-block !important;
-    width: 100%;
+    font-size: 12px !important;
   }
 
   table.body .latest-post-title {
     display: inline-block !important;
     width: 100%;
-    padding-right: 0 !important;
-    padding-bottom: 8px !important;
+    padding-right: 8px !important;
   }
 
   table.body .latest-post h4,
 table.body .latest-post h4 span {
-    padding: 4px 0 !important;
-    font-size: 18px !important;
+    padding: 4px 0 6px !important;
+    font-size: 15px !important;
   }
 
-  table.body .latest-post p,
-table.body .latest-post p span {
+  table.body .latest-post-excerpt,
+table.body .latest-post-excerpt a,
+table.body .latest-post-excerpt span {
     font-size: 13px !important;
-    line-height: 1.25em;
+    line-height: 1.2 !important;
+  }
+
+  table.body .latest-post-excerpt span {
+    display: none !important;
   }
 
   table.body .subscription-box h3 {
@@ -898,7 +882,8 @@ table.body .manage-subscription {
     line-height: 1.3em !important;
   }
 
-  table.body h2 {
+  table.body h2,
+table.body h2 span {
     font-size: 26px !important;
     line-height: 1.22em !important;
   }
@@ -944,11 +929,6 @@ table.body .manage-subscription {
   table.body hr {
     margin: 2em 0 !important;
   }
-
-  table.body figcaption,
-table.body figcaption a {
-    font-size: 13px !important;
-  }
 }
 @media all {
   .subscription-details p.hidden {
@@ -1318,8 +1298,7 @@ Object {
   table.body p,
 table.body ul,
 table.body ol,
-table.body td,
-table.body span {
+table.body td {
     font-size: 16px !important;
   }
 
@@ -1435,35 +1414,30 @@ table.body .feedback-button-mobile-text {
   }
 
   table.body .latest-posts-header {
-    font-size: 14px !important;
-  }
-
-  table.body .latest-post-img {
-    display: none !important;
-  }
-
-  table.body .latest-post-img-mobile {
-    display: inline-block !important;
-    width: 100%;
+    font-size: 12px !important;
   }
 
   table.body .latest-post-title {
     display: inline-block !important;
     width: 100%;
-    padding-right: 0 !important;
-    padding-bottom: 8px !important;
+    padding-right: 8px !important;
   }
 
   table.body .latest-post h4,
 table.body .latest-post h4 span {
-    padding: 4px 0 !important;
-    font-size: 18px !important;
+    padding: 4px 0 6px !important;
+    font-size: 15px !important;
   }
 
-  table.body .latest-post p,
-table.body .latest-post p span {
+  table.body .latest-post-excerpt,
+table.body .latest-post-excerpt a,
+table.body .latest-post-excerpt span {
     font-size: 13px !important;
-    line-height: 1.25em;
+    line-height: 1.2 !important;
+  }
+
+  table.body .latest-post-excerpt span {
+    display: none !important;
   }
 
   table.body .subscription-box h3 {
@@ -1508,7 +1482,8 @@ table.body .manage-subscription {
     line-height: 1.3em !important;
   }
 
-  table.body h2 {
+  table.body h2,
+table.body h2 span {
     font-size: 26px !important;
     line-height: 1.22em !important;
   }
@@ -1554,11 +1529,6 @@ table.body .manage-subscription {
   table.body hr {
     margin: 2em 0 !important;
   }
-
-  table.body figcaption,
-table.body figcaption a {
-    font-size: 13px !important;
-  }
 }
 @media all {
   .subscription-details p.hidden {
@@ -1928,8 +1898,7 @@ Object {
   table.body p,
 table.body ul,
 table.body ol,
-table.body td,
-table.body span {
+table.body td {
     font-size: 16px !important;
   }
 
@@ -2045,35 +2014,30 @@ table.body .feedback-button-mobile-text {
   }
 
   table.body .latest-posts-header {
-    font-size: 14px !important;
-  }
-
-  table.body .latest-post-img {
-    display: none !important;
-  }
-
-  table.body .latest-post-img-mobile {
-    display: inline-block !important;
-    width: 100%;
+    font-size: 12px !important;
   }
 
   table.body .latest-post-title {
     display: inline-block !important;
     width: 100%;
-    padding-right: 0 !important;
-    padding-bottom: 8px !important;
+    padding-right: 8px !important;
   }
 
   table.body .latest-post h4,
 table.body .latest-post h4 span {
-    padding: 4px 0 !important;
-    font-size: 18px !important;
+    padding: 4px 0 6px !important;
+    font-size: 15px !important;
   }
 
-  table.body .latest-post p,
-table.body .latest-post p span {
+  table.body .latest-post-excerpt,
+table.body .latest-post-excerpt a,
+table.body .latest-post-excerpt span {
     font-size: 13px !important;
-    line-height: 1.25em;
+    line-height: 1.2 !important;
+  }
+
+  table.body .latest-post-excerpt span {
+    display: none !important;
   }
 
   table.body .subscription-box h3 {
@@ -2118,7 +2082,8 @@ table.body .manage-subscription {
     line-height: 1.3em !important;
   }
 
-  table.body h2 {
+  table.body h2,
+table.body h2 span {
     font-size: 26px !important;
     line-height: 1.22em !important;
   }
@@ -2164,11 +2129,6 @@ table.body .manage-subscription {
   table.body hr {
     margin: 2em 0 !important;
   }
-
-  table.body figcaption,
-table.body figcaption a {
-    font-size: 13px !important;
-  }
 }
 @media all {
   .subscription-details p.hidden {
@@ -2538,8 +2498,7 @@ Object {
   table.body p,
 table.body ul,
 table.body ol,
-table.body td,
-table.body span {
+table.body td {
     font-size: 16px !important;
   }
 
@@ -2655,35 +2614,30 @@ table.body .feedback-button-mobile-text {
   }
 
   table.body .latest-posts-header {
-    font-size: 14px !important;
-  }
-
-  table.body .latest-post-img {
-    display: none !important;
-  }
-
-  table.body .latest-post-img-mobile {
-    display: inline-block !important;
-    width: 100%;
+    font-size: 12px !important;
   }
 
   table.body .latest-post-title {
     display: inline-block !important;
     width: 100%;
-    padding-right: 0 !important;
-    padding-bottom: 8px !important;
+    padding-right: 8px !important;
   }
 
   table.body .latest-post h4,
 table.body .latest-post h4 span {
-    padding: 4px 0 !important;
-    font-size: 18px !important;
+    padding: 4px 0 6px !important;
+    font-size: 15px !important;
   }
 
-  table.body .latest-post p,
-table.body .latest-post p span {
+  table.body .latest-post-excerpt,
+table.body .latest-post-excerpt a,
+table.body .latest-post-excerpt span {
     font-size: 13px !important;
-    line-height: 1.25em;
+    line-height: 1.2 !important;
+  }
+
+  table.body .latest-post-excerpt span {
+    display: none !important;
   }
 
   table.body .subscription-box h3 {
@@ -2728,7 +2682,8 @@ table.body .manage-subscription {
     line-height: 1.3em !important;
   }
 
-  table.body h2 {
+  table.body h2,
+table.body h2 span {
     font-size: 26px !important;
     line-height: 1.22em !important;
   }
@@ -2774,11 +2729,6 @@ table.body .manage-subscription {
   table.body hr {
     margin: 2em 0 !important;
   }
-
-  table.body figcaption,
-table.body figcaption a {
-    font-size: 13px !important;
-  }
 }
 @media all {
   .subscription-details p.hidden {
@@ -3096,8 +3046,7 @@ Object {
   table.body p,
 table.body ul,
 table.body ol,
-table.body td,
-table.body span {
+table.body td {
     font-size: 16px !important;
   }
 
@@ -3213,35 +3162,30 @@ table.body .feedback-button-mobile-text {
   }
 
   table.body .latest-posts-header {
-    font-size: 14px !important;
-  }
-
-  table.body .latest-post-img {
-    display: none !important;
-  }
-
-  table.body .latest-post-img-mobile {
-    display: inline-block !important;
-    width: 100%;
+    font-size: 12px !important;
   }
 
   table.body .latest-post-title {
     display: inline-block !important;
     width: 100%;
-    padding-right: 0 !important;
-    padding-bottom: 8px !important;
+    padding-right: 8px !important;
   }
 
   table.body .latest-post h4,
 table.body .latest-post h4 span {
-    padding: 4px 0 !important;
-    font-size: 18px !important;
+    padding: 4px 0 6px !important;
+    font-size: 15px !important;
   }
 
-  table.body .latest-post p,
-table.body .latest-post p span {
+  table.body .latest-post-excerpt,
+table.body .latest-post-excerpt a,
+table.body .latest-post-excerpt span {
     font-size: 13px !important;
-    line-height: 1.25em;
+    line-height: 1.2 !important;
+  }
+
+  table.body .latest-post-excerpt span {
+    display: none !important;
   }
 
   table.body .subscription-box h3 {
@@ -3286,7 +3230,8 @@ table.body .manage-subscription {
     line-height: 1.3em !important;
   }
 
-  table.body h2 {
+  table.body h2,
+table.body h2 span {
     font-size: 26px !important;
     line-height: 1.22em !important;
   }
@@ -3332,11 +3277,6 @@ table.body .manage-subscription {
   table.body hr {
     margin: 2em 0 !important;
   }
-
-  table.body figcaption,
-table.body figcaption a {
-    font-size: 13px !important;
-  }
 }
 @media all {
   .subscription-details p.hidden {
@@ -3706,8 +3646,7 @@ Object {
   table.body p,
 table.body ul,
 table.body ol,
-table.body td,
-table.body span {
+table.body td {
     font-size: 16px !important;
   }
 
@@ -3823,35 +3762,30 @@ table.body .feedback-button-mobile-text {
   }
 
   table.body .latest-posts-header {
-    font-size: 14px !important;
-  }
-
-  table.body .latest-post-img {
-    display: none !important;
-  }
-
-  table.body .latest-post-img-mobile {
-    display: inline-block !important;
-    width: 100%;
+    font-size: 12px !important;
   }
 
   table.body .latest-post-title {
     display: inline-block !important;
     width: 100%;
-    padding-right: 0 !important;
-    padding-bottom: 8px !important;
+    padding-right: 8px !important;
   }
 
   table.body .latest-post h4,
 table.body .latest-post h4 span {
-    padding: 4px 0 !important;
-    font-size: 18px !important;
+    padding: 4px 0 6px !important;
+    font-size: 15px !important;
   }
 
-  table.body .latest-post p,
-table.body .latest-post p span {
+  table.body .latest-post-excerpt,
+table.body .latest-post-excerpt a,
+table.body .latest-post-excerpt span {
     font-size: 13px !important;
-    line-height: 1.25em;
+    line-height: 1.2 !important;
+  }
+
+  table.body .latest-post-excerpt span {
+    display: none !important;
   }
 
   table.body .subscription-box h3 {
@@ -3896,7 +3830,8 @@ table.body .manage-subscription {
     line-height: 1.3em !important;
   }
 
-  table.body h2 {
+  table.body h2,
+table.body h2 span {
     font-size: 26px !important;
     line-height: 1.22em !important;
   }
@@ -3942,11 +3877,6 @@ table.body .manage-subscription {
   table.body hr {
     margin: 2em 0 !important;
   }
-
-  table.body figcaption,
-table.body figcaption a {
-    font-size: 13px !important;
-  }
 }
 @media all {
   .subscription-details p.hidden {
@@ -4416,8 +4346,7 @@ Object {
   table.body p,
 table.body ul,
 table.body ol,
-table.body td,
-table.body span {
+table.body td {
     font-size: 16px !important;
   }
 
@@ -4533,35 +4462,30 @@ table.body .feedback-button-mobile-text {
   }
 
   table.body .latest-posts-header {
-    font-size: 14px !important;
-  }
-
-  table.body .latest-post-img {
-    display: none !important;
-  }
-
-  table.body .latest-post-img-mobile {
-    display: inline-block !important;
-    width: 100%;
+    font-size: 12px !important;
   }
 
   table.body .latest-post-title {
     display: inline-block !important;
     width: 100%;
-    padding-right: 0 !important;
-    padding-bottom: 8px !important;
+    padding-right: 8px !important;
   }
 
   table.body .latest-post h4,
 table.body .latest-post h4 span {
-    padding: 4px 0 !important;
-    font-size: 18px !important;
+    padding: 4px 0 6px !important;
+    font-size: 15px !important;
   }
 
-  table.body .latest-post p,
-table.body .latest-post p span {
+  table.body .latest-post-excerpt,
+table.body .latest-post-excerpt a,
+table.body .latest-post-excerpt span {
     font-size: 13px !important;
-    line-height: 1.25em;
+    line-height: 1.2 !important;
+  }
+
+  table.body .latest-post-excerpt span {
+    display: none !important;
   }
 
   table.body .subscription-box h3 {
@@ -4606,7 +4530,8 @@ table.body .manage-subscription {
     line-height: 1.3em !important;
   }
 
-  table.body h2 {
+  table.body h2,
+table.body h2 span {
     font-size: 26px !important;
     line-height: 1.22em !important;
   }
@@ -4652,11 +4577,6 @@ table.body .manage-subscription {
   table.body hr {
     margin: 2em 0 !important;
   }
-
-  table.body figcaption,
-table.body figcaption a {
-    font-size: 13px !important;
-  }
 }
 @media all {
   .subscription-details p.hidden {
@@ -5082,8 +5002,7 @@ Object {
   table.body p,
 table.body ul,
 table.body ol,
-table.body td,
-table.body span {
+table.body td {
     font-size: 16px !important;
   }
 
@@ -5199,35 +5118,30 @@ table.body .feedback-button-mobile-text {
   }
 
   table.body .latest-posts-header {
-    font-size: 14px !important;
-  }
-
-  table.body .latest-post-img {
-    display: none !important;
-  }
-
-  table.body .latest-post-img-mobile {
-    display: inline-block !important;
-    width: 100%;
+    font-size: 12px !important;
   }
 
   table.body .latest-post-title {
     display: inline-block !important;
     width: 100%;
-    padding-right: 0 !important;
-    padding-bottom: 8px !important;
+    padding-right: 8px !important;
   }
 
   table.body .latest-post h4,
 table.body .latest-post h4 span {
-    padding: 4px 0 !important;
-    font-size: 18px !important;
+    padding: 4px 0 6px !important;
+    font-size: 15px !important;
   }
 
-  table.body .latest-post p,
-table.body .latest-post p span {
+  table.body .latest-post-excerpt,
+table.body .latest-post-excerpt a,
+table.body .latest-post-excerpt span {
     font-size: 13px !important;
-    line-height: 1.25em;
+    line-height: 1.2 !important;
+  }
+
+  table.body .latest-post-excerpt span {
+    display: none !important;
   }
 
   table.body .subscription-box h3 {
@@ -5272,7 +5186,8 @@ table.body .manage-subscription {
     line-height: 1.3em !important;
   }
 
-  table.body h2 {
+  table.body h2,
+table.body h2 span {
     font-size: 26px !important;
     line-height: 1.22em !important;
   }
@@ -5318,11 +5233,6 @@ table.body .manage-subscription {
   table.body hr {
     margin: 2em 0 !important;
   }
-
-  table.body figcaption,
-table.body figcaption a {
-    font-size: 13px !important;
-  }
 }
 @media all {
   .subscription-details p.hidden {
@@ -5454,17 +5364,17 @@ table.body figcaption a {
 
                                 <tr>
                                     <td style=\\"font-family: -apple-system, BlinkMacSystemFont, &#39;Segoe UI&#39;, Roboto, Helvetica, Arial, sans-serif, &#39;Apple Color Emoji&#39;, &#39;Segoe UI Emoji&#39;, &#39;Segoe UI Symbol&#39;; font-size: 18px; vertical-align: top; color: #000000; padding: 24px 0; border-bottom: 1px solid #e5eff5; border-bottom: 1px solid rgba(0, 0, 0, 0.12);\\" valign=\\"top\\">
-                                        <h3 class=\\"latest-posts-header\\" style=\\"margin-top: 0; font-family: -apple-system, BlinkMacSystemFont, &#39;Segoe UI&#39;, Roboto, Helvetica, Arial, sans-serif, &#39;Apple Color Emoji&#39;, &#39;Segoe UI Emoji&#39;, &#39;Segoe UI Symbol&#39;; line-height: 1.11em; text-rendering: optimizeLegibility; margin: 0; padding: 8px 0 16px; color: #000000; font-size: 14px; font-weight: 700; text-transform: uppercase;\\">Keep reading</h3>
+                                        <h3 class=\\"latest-posts-header\\" style=\\"margin-top: 0; font-family: -apple-system, BlinkMacSystemFont, &#39;Segoe UI&#39;, Roboto, Helvetica, Arial, sans-serif, &#39;Apple Color Emoji&#39;, &#39;Segoe UI Emoji&#39;, &#39;Segoe UI Symbol&#39;; line-height: 1.11em; text-rendering: optimizeLegibility; margin: 0; padding: 8px 0 16px; color: #000000; font-size: 13px; font-weight: 700; text-transform: uppercase;\\">Keep reading</h3>
                                             <table role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;\\" width=\\"100%\\">
                                                 <tr>
                                                     <td class=\\"latest-post\\" style=\\"font-family: -apple-system, BlinkMacSystemFont, &#39;Segoe UI&#39;, Roboto, Helvetica, Arial, sans-serif, &#39;Apple Color Emoji&#39;, &#39;Segoe UI Emoji&#39;, &#39;Segoe UI Symbol&#39;; font-size: 18px; vertical-align: top; color: #000000; padding: 8px 0; max-width: 600px;\\" valign=\\"top\\">
                                                         <table role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;\\" width=\\"100%\\">
                                                             <tr>
                                                                 <td valign=\\"top\\" align=\\"left\\" class=\\"latest-post-title\\" style=\\"font-family: -apple-system, BlinkMacSystemFont, &#39;Segoe UI&#39;, Roboto, Helvetica, Arial, sans-serif, &#39;Apple Color Emoji&#39;, &#39;Segoe UI Emoji&#39;, &#39;Segoe UI Symbol&#39;; font-size: 18px; vertical-align: top; color: #000000; padding-right: 12px;\\">
-                                                                    <h4 class style=\\"margin-top: 0; font-family: -apple-system, BlinkMacSystemFont, &#39;Segoe UI&#39;, Roboto, Helvetica, Arial, sans-serif, &#39;Apple Color Emoji&#39;, &#39;Segoe UI Emoji&#39;, &#39;Segoe UI Symbol&#39;; text-rendering: optimizeLegibility; color: #000000; line-height: 1.2em; margin: 0; padding: 2px 0 4px; font-size: 19px; font-weight: 700;\\">
+                                                                    <h4 class style=\\"margin-top: 0; font-family: -apple-system, BlinkMacSystemFont, &#39;Segoe UI&#39;, Roboto, Helvetica, Arial, sans-serif, &#39;Apple Color Emoji&#39;, &#39;Segoe UI Emoji&#39;, &#39;Segoe UI Symbol&#39;; text-rendering: optimizeLegibility; color: #000000; line-height: 1.2em; margin: 0; padding: 2px 0 4px; font-size: 18px; font-weight: 700;\\">
                                                                         <a href=\\"http://127.0.0.1:2369/r/xxxxxx?m=member-uuid\\" style=\\"overflow-wrap: anywhere; text-decoration: none; color: #000000;\\" target=\\"_blank\\">This is a test post title</a>
                                                                     </h4>
-                                                                        <p style=\\"line-height: 1.6em; margin: 0; padding: 0; color: #000000; color: rgba(0, 0, 0, 0.5); font-size: 15px; font-weight: 400;\\">
+                                                                        <p class=\\"latest-post-excerpt\\" style=\\"line-height: 1.6em; margin: 0; padding: 0; color: #000000; color: rgba(0, 0, 0, 0.5); font-size: 15px; font-weight: 400;\\">
                                                                             <a href=\\"http://127.0.0.1:2369/r/xxxxxx?m=member-uuid\\" style=\\"overflow-wrap: anywhere; text-decoration: none; color: #000000; color: rgba(0, 0, 0, 0.5);\\" target=\\"_blank\\">Hello world</a>
                                                                         </p>
                                                                 </td>
@@ -5479,10 +5389,10 @@ table.body figcaption a {
                                                         <table role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;\\" width=\\"100%\\">
                                                             <tr>
                                                                 <td valign=\\"top\\" align=\\"left\\" class=\\"latest-post-title\\" style=\\"font-family: -apple-system, BlinkMacSystemFont, &#39;Segoe UI&#39;, Roboto, Helvetica, Arial, sans-serif, &#39;Apple Color Emoji&#39;, &#39;Segoe UI Emoji&#39;, &#39;Segoe UI Symbol&#39;; font-size: 18px; vertical-align: top; color: #000000; padding-right: 12px;\\">
-                                                                    <h4 class style=\\"margin-top: 0; font-family: -apple-system, BlinkMacSystemFont, &#39;Segoe UI&#39;, Roboto, Helvetica, Arial, sans-serif, &#39;Apple Color Emoji&#39;, &#39;Segoe UI Emoji&#39;, &#39;Segoe UI Symbol&#39;; text-rendering: optimizeLegibility; color: #000000; line-height: 1.2em; margin: 0; padding: 2px 0 4px; font-size: 19px; font-weight: 700;\\">
+                                                                    <h4 class style=\\"margin-top: 0; font-family: -apple-system, BlinkMacSystemFont, &#39;Segoe UI&#39;, Roboto, Helvetica, Arial, sans-serif, &#39;Apple Color Emoji&#39;, &#39;Segoe UI Emoji&#39;, &#39;Segoe UI Symbol&#39;; text-rendering: optimizeLegibility; color: #000000; line-height: 1.2em; margin: 0; padding: 2px 0 4px; font-size: 18px; font-weight: 700;\\">
                                                                         <a href=\\"http://127.0.0.1:2369/r/xxxxxx?m=member-uuid\\" style=\\"overflow-wrap: anywhere; text-decoration: none; color: #000000;\\" target=\\"_blank\\">This is a test post title</a>
                                                                     </h4>
-                                                                        <p style=\\"line-height: 1.6em; margin: 0; padding: 0; color: #000000; color: rgba(0, 0, 0, 0.5); font-size: 15px; font-weight: 400;\\">
+                                                                        <p class=\\"latest-post-excerpt\\" style=\\"line-height: 1.6em; margin: 0; padding: 0; color: #000000; color: rgba(0, 0, 0, 0.5); font-size: 15px; font-weight: 400;\\">
                                                                             <a href=\\"http://127.0.0.1:2369/r/xxxxxx?m=member-uuid\\" style=\\"overflow-wrap: anywhere; text-decoration: none; color: #000000; color: rgba(0, 0, 0, 0.5);\\" target=\\"_blank\\">Hello world</a>
                                                                         </p>
                                                                 </td>
@@ -5497,10 +5407,10 @@ table.body figcaption a {
                                                         <table role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;\\" width=\\"100%\\">
                                                             <tr>
                                                                 <td valign=\\"top\\" align=\\"left\\" class=\\"latest-post-title\\" style=\\"font-family: -apple-system, BlinkMacSystemFont, &#39;Segoe UI&#39;, Roboto, Helvetica, Arial, sans-serif, &#39;Apple Color Emoji&#39;, &#39;Segoe UI Emoji&#39;, &#39;Segoe UI Symbol&#39;; font-size: 18px; vertical-align: top; color: #000000; padding-right: 12px;\\">
-                                                                    <h4 class style=\\"margin-top: 0; font-family: -apple-system, BlinkMacSystemFont, &#39;Segoe UI&#39;, Roboto, Helvetica, Arial, sans-serif, &#39;Apple Color Emoji&#39;, &#39;Segoe UI Emoji&#39;, &#39;Segoe UI Symbol&#39;; text-rendering: optimizeLegibility; color: #000000; line-height: 1.2em; margin: 0; padding: 2px 0 4px; font-size: 19px; font-weight: 700;\\">
+                                                                    <h4 class style=\\"margin-top: 0; font-family: -apple-system, BlinkMacSystemFont, &#39;Segoe UI&#39;, Roboto, Helvetica, Arial, sans-serif, &#39;Apple Color Emoji&#39;, &#39;Segoe UI Emoji&#39;, &#39;Segoe UI Symbol&#39;; text-rendering: optimizeLegibility; color: #000000; line-height: 1.2em; margin: 0; padding: 2px 0 4px; font-size: 18px; font-weight: 700;\\">
                                                                         <a href=\\"http://127.0.0.1:2369/r/xxxxxx?m=member-uuid\\" style=\\"overflow-wrap: anywhere; text-decoration: none; color: #000000;\\" target=\\"_blank\\">This is a test post title</a>
                                                                     </h4>
-                                                                        <p style=\\"line-height: 1.6em; margin: 0; padding: 0; color: #000000; color: rgba(0, 0, 0, 0.5); font-size: 15px; font-weight: 400;\\">
+                                                                        <p class=\\"latest-post-excerpt\\" style=\\"line-height: 1.6em; margin: 0; padding: 0; color: #000000; color: rgba(0, 0, 0, 0.5); font-size: 15px; font-weight: 400;\\">
                                                                             <a href=\\"http://127.0.0.1:2369/r/xxxxxx?m=member-uuid\\" style=\\"overflow-wrap: anywhere; text-decoration: none; color: #000000; color: rgba(0, 0, 0, 0.5);\\" target=\\"_blank\\">Hello world</a>
                                                                         </p>
                                                                 </td>
@@ -5837,8 +5747,7 @@ Object {
   table.body p,
 table.body ul,
 table.body ol,
-table.body td,
-table.body span {
+table.body td {
     font-size: 16px !important;
   }
 
@@ -5954,35 +5863,30 @@ table.body .feedback-button-mobile-text {
   }
 
   table.body .latest-posts-header {
-    font-size: 14px !important;
-  }
-
-  table.body .latest-post-img {
-    display: none !important;
-  }
-
-  table.body .latest-post-img-mobile {
-    display: inline-block !important;
-    width: 100%;
+    font-size: 12px !important;
   }
 
   table.body .latest-post-title {
     display: inline-block !important;
     width: 100%;
-    padding-right: 0 !important;
-    padding-bottom: 8px !important;
+    padding-right: 8px !important;
   }
 
   table.body .latest-post h4,
 table.body .latest-post h4 span {
-    padding: 4px 0 !important;
-    font-size: 18px !important;
+    padding: 4px 0 6px !important;
+    font-size: 15px !important;
   }
 
-  table.body .latest-post p,
-table.body .latest-post p span {
+  table.body .latest-post-excerpt,
+table.body .latest-post-excerpt a,
+table.body .latest-post-excerpt span {
     font-size: 13px !important;
-    line-height: 1.25em;
+    line-height: 1.2 !important;
+  }
+
+  table.body .latest-post-excerpt span {
+    display: none !important;
   }
 
   table.body .subscription-box h3 {
@@ -6027,7 +5931,8 @@ table.body .manage-subscription {
     line-height: 1.3em !important;
   }
 
-  table.body h2 {
+  table.body h2,
+table.body h2 span {
     font-size: 26px !important;
     line-height: 1.22em !important;
   }
@@ -6073,11 +5978,6 @@ table.body .manage-subscription {
   table.body hr {
     margin: 2em 0 !important;
   }
-
-  table.body figcaption,
-table.body figcaption a {
-    font-size: 13px !important;
-  }
 }
 @media all {
   .subscription-details p.hidden {
@@ -6502,8 +6402,7 @@ Object {
   table.body p,
 table.body ul,
 table.body ol,
-table.body td,
-table.body span {
+table.body td {
     font-size: 16px !important;
   }
 
@@ -6619,35 +6518,30 @@ table.body .feedback-button-mobile-text {
   }
 
   table.body .latest-posts-header {
-    font-size: 14px !important;
-  }
-
-  table.body .latest-post-img {
-    display: none !important;
-  }
-
-  table.body .latest-post-img-mobile {
-    display: inline-block !important;
-    width: 100%;
+    font-size: 12px !important;
   }
 
   table.body .latest-post-title {
     display: inline-block !important;
     width: 100%;
-    padding-right: 0 !important;
-    padding-bottom: 8px !important;
+    padding-right: 8px !important;
   }
 
   table.body .latest-post h4,
 table.body .latest-post h4 span {
-    padding: 4px 0 !important;
-    font-size: 18px !important;
+    padding: 4px 0 6px !important;
+    font-size: 15px !important;
   }
 
-  table.body .latest-post p,
-table.body .latest-post p span {
+  table.body .latest-post-excerpt,
+table.body .latest-post-excerpt a,
+table.body .latest-post-excerpt span {
     font-size: 13px !important;
-    line-height: 1.25em;
+    line-height: 1.2 !important;
+  }
+
+  table.body .latest-post-excerpt span {
+    display: none !important;
   }
 
   table.body .subscription-box h3 {
@@ -6692,7 +6586,8 @@ table.body .manage-subscription {
     line-height: 1.3em !important;
   }
 
-  table.body h2 {
+  table.body h2,
+table.body h2 span {
     font-size: 26px !important;
     line-height: 1.22em !important;
   }
@@ -6738,11 +6633,6 @@ table.body .manage-subscription {
   table.body hr {
     margin: 2em 0 !important;
   }
-
-  table.body figcaption,
-table.body figcaption a {
-    font-size: 13px !important;
-  }
 }
 @media all {
   .subscription-details p.hidden {
@@ -7167,8 +7057,7 @@ Object {
   table.body p,
 table.body ul,
 table.body ol,
-table.body td,
-table.body span {
+table.body td {
     font-size: 16px !important;
   }
 
@@ -7284,35 +7173,30 @@ table.body .feedback-button-mobile-text {
   }
 
   table.body .latest-posts-header {
-    font-size: 14px !important;
-  }
-
-  table.body .latest-post-img {
-    display: none !important;
-  }
-
-  table.body .latest-post-img-mobile {
-    display: inline-block !important;
-    width: 100%;
+    font-size: 12px !important;
   }
 
   table.body .latest-post-title {
     display: inline-block !important;
     width: 100%;
-    padding-right: 0 !important;
-    padding-bottom: 8px !important;
+    padding-right: 8px !important;
   }
 
   table.body .latest-post h4,
 table.body .latest-post h4 span {
-    padding: 4px 0 !important;
-    font-size: 18px !important;
+    padding: 4px 0 6px !important;
+    font-size: 15px !important;
   }
 
-  table.body .latest-post p,
-table.body .latest-post p span {
+  table.body .latest-post-excerpt,
+table.body .latest-post-excerpt a,
+table.body .latest-post-excerpt span {
     font-size: 13px !important;
-    line-height: 1.25em;
+    line-height: 1.2 !important;
+  }
+
+  table.body .latest-post-excerpt span {
+    display: none !important;
   }
 
   table.body .subscription-box h3 {
@@ -7357,7 +7241,8 @@ table.body .manage-subscription {
     line-height: 1.3em !important;
   }
 
-  table.body h2 {
+  table.body h2,
+table.body h2 span {
     font-size: 26px !important;
     line-height: 1.22em !important;
   }
@@ -7403,11 +7288,6 @@ table.body .manage-subscription {
   table.body hr {
     margin: 2em 0 !important;
   }
-
-  table.body figcaption,
-table.body figcaption a {
-    font-size: 13px !important;
-  }
 }
 @media all {
   .subscription-details p.hidden {
@@ -7832,8 +7712,7 @@ Object {
   table.body p,
 table.body ul,
 table.body ol,
-table.body td,
-table.body span {
+table.body td {
     font-size: 16px !important;
   }
 
@@ -7949,35 +7828,30 @@ table.body .feedback-button-mobile-text {
   }
 
   table.body .latest-posts-header {
-    font-size: 14px !important;
-  }
-
-  table.body .latest-post-img {
-    display: none !important;
-  }
-
-  table.body .latest-post-img-mobile {
-    display: inline-block !important;
-    width: 100%;
+    font-size: 12px !important;
   }
 
   table.body .latest-post-title {
     display: inline-block !important;
     width: 100%;
-    padding-right: 0 !important;
-    padding-bottom: 8px !important;
+    padding-right: 8px !important;
   }
 
   table.body .latest-post h4,
 table.body .latest-post h4 span {
-    padding: 4px 0 !important;
-    font-size: 18px !important;
+    padding: 4px 0 6px !important;
+    font-size: 15px !important;
   }
 
-  table.body .latest-post p,
-table.body .latest-post p span {
+  table.body .latest-post-excerpt,
+table.body .latest-post-excerpt a,
+table.body .latest-post-excerpt span {
     font-size: 13px !important;
-    line-height: 1.25em;
+    line-height: 1.2 !important;
+  }
+
+  table.body .latest-post-excerpt span {
+    display: none !important;
   }
 
   table.body .subscription-box h3 {
@@ -8022,7 +7896,8 @@ table.body .manage-subscription {
     line-height: 1.3em !important;
   }
 
-  table.body h2 {
+  table.body h2,
+table.body h2 span {
     font-size: 26px !important;
     line-height: 1.22em !important;
   }
@@ -8068,11 +7943,6 @@ table.body .manage-subscription {
   table.body hr {
     margin: 2em 0 !important;
   }
-
-  table.body figcaption,
-table.body figcaption a {
-    font-size: 13px !important;
-  }
 }
 @media all {
   .subscription-details p.hidden {
@@ -8497,8 +8367,7 @@ Object {
   table.body p,
 table.body ul,
 table.body ol,
-table.body td,
-table.body span {
+table.body td {
     font-size: 16px !important;
   }
 
@@ -8614,35 +8483,30 @@ table.body .feedback-button-mobile-text {
   }
 
   table.body .latest-posts-header {
-    font-size: 14px !important;
-  }
-
-  table.body .latest-post-img {
-    display: none !important;
-  }
-
-  table.body .latest-post-img-mobile {
-    display: inline-block !important;
-    width: 100%;
+    font-size: 12px !important;
   }
 
   table.body .latest-post-title {
     display: inline-block !important;
     width: 100%;
-    padding-right: 0 !important;
-    padding-bottom: 8px !important;
+    padding-right: 8px !important;
   }
 
   table.body .latest-post h4,
 table.body .latest-post h4 span {
-    padding: 4px 0 !important;
-    font-size: 18px !important;
+    padding: 4px 0 6px !important;
+    font-size: 15px !important;
   }
 
-  table.body .latest-post p,
-table.body .latest-post p span {
+  table.body .latest-post-excerpt,
+table.body .latest-post-excerpt a,
+table.body .latest-post-excerpt span {
     font-size: 13px !important;
-    line-height: 1.25em;
+    line-height: 1.2 !important;
+  }
+
+  table.body .latest-post-excerpt span {
+    display: none !important;
   }
 
   table.body .subscription-box h3 {
@@ -8687,7 +8551,8 @@ table.body .manage-subscription {
     line-height: 1.3em !important;
   }
 
-  table.body h2 {
+  table.body h2,
+table.body h2 span {
     font-size: 26px !important;
     line-height: 1.22em !important;
   }
@@ -8733,11 +8598,6 @@ table.body .manage-subscription {
   table.body hr {
     margin: 2em 0 !important;
   }
-
-  table.body figcaption,
-table.body figcaption a {
-    font-size: 13px !important;
-  }
 }
 @media all {
   .subscription-details p.hidden {
@@ -9162,8 +9022,7 @@ Object {
   table.body p,
 table.body ul,
 table.body ol,
-table.body td,
-table.body span {
+table.body td {
     font-size: 16px !important;
   }
 
@@ -9279,35 +9138,30 @@ table.body .feedback-button-mobile-text {
   }
 
   table.body .latest-posts-header {
-    font-size: 14px !important;
-  }
-
-  table.body .latest-post-img {
-    display: none !important;
-  }
-
-  table.body .latest-post-img-mobile {
-    display: inline-block !important;
-    width: 100%;
+    font-size: 12px !important;
   }
 
   table.body .latest-post-title {
     display: inline-block !important;
     width: 100%;
-    padding-right: 0 !important;
-    padding-bottom: 8px !important;
+    padding-right: 8px !important;
   }
 
   table.body .latest-post h4,
 table.body .latest-post h4 span {
-    padding: 4px 0 !important;
-    font-size: 18px !important;
+    padding: 4px 0 6px !important;
+    font-size: 15px !important;
   }
 
-  table.body .latest-post p,
-table.body .latest-post p span {
+  table.body .latest-post-excerpt,
+table.body .latest-post-excerpt a,
+table.body .latest-post-excerpt span {
     font-size: 13px !important;
-    line-height: 1.25em;
+    line-height: 1.2 !important;
+  }
+
+  table.body .latest-post-excerpt span {
+    display: none !important;
   }
 
   table.body .subscription-box h3 {
@@ -9352,7 +9206,8 @@ table.body .manage-subscription {
     line-height: 1.3em !important;
   }
 
-  table.body h2 {
+  table.body h2,
+table.body h2 span {
     font-size: 26px !important;
     line-height: 1.22em !important;
   }
@@ -9398,11 +9253,6 @@ table.body .manage-subscription {
   table.body hr {
     margin: 2em 0 !important;
   }
-
-  table.body figcaption,
-table.body figcaption a {
-    font-size: 13px !important;
-  }
 }
 @media all {
   .subscription-details p.hidden {
@@ -9774,8 +9624,7 @@ Object {
   table.body p,
 table.body ul,
 table.body ol,
-table.body td,
-table.body span {
+table.body td {
     font-size: 16px !important;
   }
 
@@ -9891,35 +9740,30 @@ table.body .feedback-button-mobile-text {
   }
 
   table.body .latest-posts-header {
-    font-size: 14px !important;
-  }
-
-  table.body .latest-post-img {
-    display: none !important;
-  }
-
-  table.body .latest-post-img-mobile {
-    display: inline-block !important;
-    width: 100%;
+    font-size: 12px !important;
   }
 
   table.body .latest-post-title {
     display: inline-block !important;
     width: 100%;
-    padding-right: 0 !important;
-    padding-bottom: 8px !important;
+    padding-right: 8px !important;
   }
 
   table.body .latest-post h4,
 table.body .latest-post h4 span {
-    padding: 4px 0 !important;
-    font-size: 18px !important;
+    padding: 4px 0 6px !important;
+    font-size: 15px !important;
   }
 
-  table.body .latest-post p,
-table.body .latest-post p span {
+  table.body .latest-post-excerpt,
+table.body .latest-post-excerpt a,
+table.body .latest-post-excerpt span {
     font-size: 13px !important;
-    line-height: 1.25em;
+    line-height: 1.2 !important;
+  }
+
+  table.body .latest-post-excerpt span {
+    display: none !important;
   }
 
   table.body .subscription-box h3 {
@@ -9964,7 +9808,8 @@ table.body .manage-subscription {
     line-height: 1.3em !important;
   }
 
-  table.body h2 {
+  table.body h2,
+table.body h2 span {
     font-size: 26px !important;
     line-height: 1.22em !important;
   }
@@ -10010,11 +9855,6 @@ table.body .manage-subscription {
   table.body hr {
     margin: 2em 0 !important;
   }
-
-  table.body figcaption,
-table.body figcaption a {
-    font-size: 13px !important;
-  }
 }
 @media all {
   .subscription-details p.hidden {
diff --git a/ghost/core/test/integration/services/email-service/__snapshots__/cards.test.js.snap b/ghost/core/test/integration/services/email-service/__snapshots__/cards.test.js.snap
index 6fd43c8da08..5f3d5f656f0 100644
--- a/ghost/core/test/integration/services/email-service/__snapshots__/cards.test.js.snap
+++ b/ghost/core/test/integration/services/email-service/__snapshots__/cards.test.js.snap
@@ -84,8 +84,7 @@ Object {
   table.body p,
 table.body ul,
 table.body ol,
-table.body td,
-table.body span {
+table.body td {
     font-size: 16px !important;
   }
 
@@ -201,35 +200,30 @@ table.body .feedback-button-mobile-text {
   }
 
   table.body .latest-posts-header {
-    font-size: 14px !important;
-  }
-
-  table.body .latest-post-img {
-    display: none !important;
-  }
-
-  table.body .latest-post-img-mobile {
-    display: inline-block !important;
-    width: 100%;
+    font-size: 12px !important;
   }
 
   table.body .latest-post-title {
     display: inline-block !important;
     width: 100%;
-    padding-right: 0 !important;
-    padding-bottom: 8px !important;
+    padding-right: 8px !important;
   }
 
   table.body .latest-post h4,
 table.body .latest-post h4 span {
-    padding: 4px 0 !important;
-    font-size: 18px !important;
+    padding: 4px 0 6px !important;
+    font-size: 15px !important;
   }
 
-  table.body .latest-post p,
-table.body .latest-post p span {
+  table.body .latest-post-excerpt,
+table.body .latest-post-excerpt a,
+table.body .latest-post-excerpt span {
     font-size: 13px !important;
-    line-height: 1.25em;
+    line-height: 1.2 !important;
+  }
+
+  table.body .latest-post-excerpt span {
+    display: none !important;
   }
 
   table.body .subscription-box h3 {
@@ -274,7 +268,8 @@ table.body .manage-subscription {
     line-height: 1.3em !important;
   }
 
-  table.body h2 {
+  table.body h2,
+table.body h2 span {
     font-size: 26px !important;
     line-height: 1.22em !important;
   }
@@ -320,11 +315,6 @@ table.body .manage-subscription {
   table.body hr {
     margin: 2em 0 !important;
   }
-
-  table.body figcaption,
-table.body figcaption a {
-    font-size: 13px !important;
-  }
 }
 @media all {
   .subscription-details p.hidden {
@@ -694,8 +684,7 @@ Object {
   table.body p,
 table.body ul,
 table.body ol,
-table.body td,
-table.body span {
+table.body td {
     font-size: 16px !important;
   }
 
@@ -811,35 +800,30 @@ table.body .feedback-button-mobile-text {
   }
 
   table.body .latest-posts-header {
-    font-size: 14px !important;
-  }
-
-  table.body .latest-post-img {
-    display: none !important;
-  }
-
-  table.body .latest-post-img-mobile {
-    display: inline-block !important;
-    width: 100%;
+    font-size: 12px !important;
   }
 
   table.body .latest-post-title {
     display: inline-block !important;
     width: 100%;
-    padding-right: 0 !important;
-    padding-bottom: 8px !important;
+    padding-right: 8px !important;
   }
 
   table.body .latest-post h4,
 table.body .latest-post h4 span {
-    padding: 4px 0 !important;
-    font-size: 18px !important;
+    padding: 4px 0 6px !important;
+    font-size: 15px !important;
   }
 
-  table.body .latest-post p,
-table.body .latest-post p span {
+  table.body .latest-post-excerpt,
+table.body .latest-post-excerpt a,
+table.body .latest-post-excerpt span {
     font-size: 13px !important;
-    line-height: 1.25em;
+    line-height: 1.2 !important;
+  }
+
+  table.body .latest-post-excerpt span {
+    display: none !important;
   }
 
   table.body .subscription-box h3 {
@@ -884,7 +868,8 @@ table.body .manage-subscription {
     line-height: 1.3em !important;
   }
 
-  table.body h2 {
+  table.body h2,
+table.body h2 span {
     font-size: 26px !important;
     line-height: 1.22em !important;
   }
@@ -930,11 +915,6 @@ table.body .manage-subscription {
   table.body hr {
     margin: 2em 0 !important;
   }
-
-  table.body figcaption,
-table.body figcaption a {
-    font-size: 13px !important;
-  }
 }
 @media all {
   .subscription-details p.hidden {
diff --git a/ghost/core/test/unit/api/canary/utils/serializers/input/posts.test.js b/ghost/core/test/unit/api/canary/utils/serializers/input/posts.test.js
index 8bc7a67096d..dce0876355c 100644
--- a/ghost/core/test/unit/api/canary/utils/serializers/input/posts.test.js
+++ b/ghost/core/test/unit/api/canary/utils/serializers/input/posts.test.js
@@ -232,7 +232,7 @@ describe('Unit: endpoints/utils/serializers/input/posts', function () {
                 should.equal(null, postData.mobiledoc);
             });
 
-            it('transforms html when html is present in data and source options', function () {
+            it.skip('transforms html when html is present in data and source options', function () { // eslint-disable-line
                 const apiConfig = {};
                 const lexical = '{"root":{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1}],"direction":null,"format":"","indent":0,"type":"root","version":1}}';
                 const frame = {
diff --git a/ghost/core/test/unit/frontend/web/middleware/static-theme.test.js b/ghost/core/test/unit/frontend/web/middleware/static-theme.test.js
index 7fabf13b1e3..fda60859b4c 100644
--- a/ghost/core/test/unit/frontend/web/middleware/static-theme.test.js
+++ b/ghost/core/test/unit/frontend/web/middleware/static-theme.test.js
@@ -157,6 +157,23 @@ describe('staticTheme', function () {
         });
     });
 
+    it('should NOT skip if file is allowed even if nested', function (done) {
+        req.path = '/.well-known/assetlinks.json';
+
+        staticTheme()(req, res, function next() {
+            // Specifically gets called twice
+            activeThemeStub.calledTwice.should.be.true();
+            expressStaticStub.called.should.be.true();
+
+            // Check that express static gets called with the theme path + maxAge
+            should.exist(expressStaticStub.firstCall.args);
+            expressStaticStub.firstCall.args[0].should.eql('my/fake/path');
+            expressStaticStub.firstCall.args[1].should.be.an.Object().with.property('maxAge');
+
+            done();
+        });
+    });
+
     it('should NOT skip if file is in assets', function (done) {
         req.path = '/assets/whatever.json';
 
diff --git a/ghost/core/test/unit/server/data/schema/integrity.test.js b/ghost/core/test/unit/server/data/schema/integrity.test.js
index 238935aa985..bf94233d485 100644
--- a/ghost/core/test/unit/server/data/schema/integrity.test.js
+++ b/ghost/core/test/unit/server/data/schema/integrity.test.js
@@ -35,7 +35,7 @@ const validateRouteSettings = require('../../../../../core/server/services/route
  */
 describe('DB version integrity', function () {
     // Only these variables should need updating
-    const currentSchemaHash = '013334f4f51aae785b9afd345861c06a';
+    const currentSchemaHash = '1c1f476e830ce01a0167229697bd4523';
     const currentFixturesHash = '4db87173699ad9c9d8a67ccab96dfd2d';
     const currentSettingsHash = '3128d4ec667a50049486b0c21f04be07';
     const currentRoutesHash = '3d180d52c663d173a6be791ef411ed01';
diff --git a/ghost/core/test/unit/server/services/custom-redirects/api.test.js b/ghost/core/test/unit/server/services/custom-redirects/api.test.js
index 00897808baf..66754f3c82f 100644
--- a/ghost/core/test/unit/server/services/custom-redirects/api.test.js
+++ b/ghost/core/test/unit/server/services/custom-redirects/api.test.js
@@ -116,7 +116,20 @@ describe('UNIT: redirects CustomRedirectsAPI class', function () {
                 should.fail('setFromFilePath did not throw');
             } catch (err) {
                 should.exist(err);
-                err.message.should.eql('YAML input cannot be a plain string. Check the format of your YAML file.');
+                err.message.should.eql('YAML input is invalid. Check the contents of your YAML file.');
+            }
+        });
+
+        it('throws a syntax error when setting invalid (empty) YAML redirects file', async function () {
+            const invalidFilePath = path.join(__dirname, '/invalid/redirects/yaml.json');
+            fs.readFile.withArgs(invalidFilePath, 'utf-8').resolves('');
+
+            try {
+                await customRedirectsAPI.setFromFilePath(invalidFilePath, '.yaml');
+                should.fail('setFromFilePath did not throw');
+            } catch (err) {
+                should.exist(err);
+                err.message.should.eql('YAML input is invalid. Check the contents of your YAML file.');
             }
         });
 
diff --git a/ghost/core/test/unit/server/services/members/utils.test.js b/ghost/core/test/unit/server/services/members/utils.test.js
index cff9117e0a0..885f10e708c 100644
--- a/ghost/core/test/unit/server/services/members/utils.test.js
+++ b/ghost/core/test/unit/server/services/members/utils.test.js
@@ -61,6 +61,7 @@ describe('Members Service - utils', function () {
                 extra: 'property',
                 newsletters: [{
                     id: 'newsletter-1',
+                    uuid: 'uuid-1',
                     name: 'Daily brief',
                     description: 'One email daily',
                     sender_name: 'Jamie',
@@ -82,6 +83,7 @@ describe('Members Service - utils', function () {
                 paid: true,
                 newsletters: [{
                     id: 'newsletter-1',
+                    uuid: 'uuid-1',
                     name: 'Daily brief',
                     description: 'One email daily',
                     sort_order: 0
diff --git a/ghost/custom-theme-settings-service/package.json b/ghost/custom-theme-settings-service/package.json
index 243934ec72f..0332d208250 100644
--- a/ghost/custom-theme-settings-service/package.json
+++ b/ghost/custom-theme-settings-service/package.json
@@ -25,10 +25,10 @@
     "sinon": "15.2.0"
   },
   "dependencies": {
-    "@tryghost/debug": "0.1.24",
+    "@tryghost/debug": "0.1.26",
     "@tryghost/errors": "1.2.26",
     "@tryghost/nql": "0.11.0",
-    "@tryghost/tpl": "0.1.24",
+    "@tryghost/tpl": "0.1.26",
     "lodash": "4.17.21"
   }
 }
diff --git a/ghost/data-generator/package.json b/ghost/data-generator/package.json
index 810ed13eeb8..4adfc78b0b5 100644
--- a/ghost/data-generator/package.json
+++ b/ghost/data-generator/package.json
@@ -26,8 +26,8 @@
   },
   "dependencies": {
     "@faker-js/faker": "7.6.0",
-    "@tryghost/root-utils": "0.3.22",
-    "@tryghost/string": "0.2.4",
+    "@tryghost/root-utils": "0.3.24",
+    "@tryghost/string": "0.2.10",
     "probability-distributions": "0.9.1"
   }
 }
diff --git a/ghost/email-analytics-service/package.json b/ghost/email-analytics-service/package.json
index 7207e9a5478..e5df733a075 100644
--- a/ghost/email-analytics-service/package.json
+++ b/ghost/email-analytics-service/package.json
@@ -23,7 +23,7 @@
     "sinon": "15.2.0"
   },
   "dependencies": {
-    "@tryghost/debug": "0.1.24",
+    "@tryghost/debug": "0.1.26",
     "lodash": "4.17.21"
   }
 }
diff --git a/ghost/email-service/lib/BatchSendingService.js b/ghost/email-service/lib/BatchSendingService.js
index 407bb3d786e..4250913342c 100644
--- a/ghost/email-service/lib/BatchSendingService.js
+++ b/ghost/email-service/lib/BatchSendingService.js
@@ -247,7 +247,7 @@ class BatchSendingService {
             while (!members || lastId) {
                 logging.info(`Fetching members batch for email ${email.id} segment ${segment}, lastId: ${lastId}`);
 
-                const filter = segmentFilter + `+id:<${lastId}`;
+                const filter = segmentFilter + `+id:<'${lastId}'`;
                 members = await this.#models.Member.getFilteredCollectionQuery({filter})
                     .orderByRaw('id DESC')
                     .select('members.id', 'members.uuid', 'members.email', 'members.name').limit(BATCH_SIZE + 1);
diff --git a/ghost/email-service/lib/EmailRenderer.js b/ghost/email-service/lib/EmailRenderer.js
index 83e384fe51f..04f5ad75074 100644
--- a/ghost/email-service/lib/EmailRenderer.js
+++ b/ghost/email-service/lib/EmailRenderer.js
@@ -368,15 +368,41 @@ class EmailRenderer {
             }, {base});
         }
 
+        // Record the original image width and height attributes before inlining the styles with juice
+        // If any images have `width: auto` or `height: auto` set via CSS, 
+        // juice will explicitly set the width/height attributes to `auto` on the <img /> tag
+        // This is not supported by Outlook, so we need to reset the width/height attributes to the original values
+        // Other clients will ignore the width/height attributes and use the inlined CSS instead
+        $ = cheerio.load(html);
+        const originalImageSizes = $('img').get().map((image) => {
+            const src = image.attribs.src;
+            const width = image.attribs.width;
+            const height = image.attribs.height;
+            return {src, width, height};
+        });
+
         // Juice HTML (inline CSS)
         const juice = require('juice');
-        juice.heightElements = ['TABLE', 'TD', 'TH'];
-        juice.widthElements = ['TABLE', 'TD', 'TH'];
         html = juice(html, {inlinePseudoElements: true, removeStyleTags: true});
 
         // happens after inlining of CSS so we can change element types without worrying about styling
         $ = cheerio.load(html);
 
+        // Reset any `height="auto"` or `width="auto"` attributes to their original values before inlining CSS
+        const imageTags = $('img').get();
+        for (let i = 0; i < imageTags.length; i += 1) {
+            // There shouldn't be any issues with consistency between these two lists, but just in case...
+            if (imageTags[i].attribs.src === originalImageSizes[i].src) {
+                // if the image width or height is set to 'auto', reset to its original value
+                if (imageTags[i].attribs.width === 'auto' && originalImageSizes[i].width) {
+                    imageTags[i].attribs.width = originalImageSizes[i].width;
+                }
+                if (imageTags[i].attribs.height === 'auto' && originalImageSizes[i].height) {
+                    imageTags[i].attribs.height = originalImageSizes[i].height;
+                }
+            }
+        }
+
         // force all links to open in new tab
         $('a').attr('target', '_blank');
 
diff --git a/ghost/email-service/lib/email-templates/partials/latest-posts.hbs b/ghost/email-service/lib/email-templates/partials/latest-posts.hbs
index ebc9cb02c7b..57d26e8b8c7 100644
--- a/ghost/email-service/lib/email-templates/partials/latest-posts.hbs
+++ b/ghost/email-service/lib/email-templates/partials/latest-posts.hbs
@@ -4,29 +4,12 @@
             <td class="latest-post">
                 <table role="presentation" border="0" cellpadding="0" cellspacing="0">
                     <tr>
-                        {{#if ../latestPostsHasImages}}
-                            {{#if featureImage}}
-                                <td class="latest-post-img-mobile">
-                                    <a href="{{url}}">
-                                        <img
-                                            src="{{featureImageMobile.src}}"
-                                            {{#if featureImageMobile.width }}
-                                                width="{{featureImageMobile.width}}"
-                                            {{/if}}
-                                            {{#if featureImageMobile.height }}
-                                                height="{{featureImageMobile.height}}"
-                                            {{/if}}
-                                        />
-                                    </a>
-                                </td>
-                            {{/if}}
-                        {{/if}}
                         <td valign="top" align="left" class="latest-post-title">
                             <h4 class="{{#if ../latestPostsHasImages}}{{#if (not featureImage)}}no-image{{/if}}{{/if}}">
                                 <a href="{{url}}">{{{title}}}</a>
                             </h4>
                             {{#if excerpt}}
-                                <p>
+                                <p class="latest-post-excerpt">
                                     <a href="{{url}}">{{{excerpt}}}</a>
                                 </p>
                             {{/if}}
diff --git a/ghost/email-service/lib/email-templates/partials/styles-old.hbs b/ghost/email-service/lib/email-templates/partials/styles-old.hbs
index 196c380547c..e5ab06d5fe3 100644
--- a/ghost/email-service/lib/email-templates/partials/styles-old.hbs
+++ b/ghost/email-service/lib/email-templates/partials/styles-old.hbs
@@ -268,7 +268,7 @@ figure {
 figcaption {
     text-align: center;
     font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol';
-    font-size: 14px;
+    font-size: 13px;
     padding-top: 5px;
     line-height: 1.5em;
 }
@@ -477,7 +477,7 @@ figure blockquote p {
     margin: 0;
     padding: 8px 0 16px;
     color: #15212A;
-    font-size: 14px;
+    font-size: 13px;
     font-weight: 700;
     text-transform: uppercase;
 }
@@ -498,20 +498,10 @@ figure blockquote p {
     text-decoration: none;
 }
 
-.latest-post-img img,
-.latest-post-img-mobile img {
+.latest-post-img img {
     object-fit: cover;
 }
 
-.latest-post-img-mobile {
-    display: none;
-}
-
-.latest-post-img-mobile img {
-    width: 100% !important;
-    height: auto !important; /* Make sure CSS ignores the height that is defined in HTML, but keep the aspect ratio from the width/height in HTML */
-}
-
 .latest-post-title {
     padding-right: 12px;
 }
@@ -519,7 +509,7 @@ figure blockquote p {
 .latest-post h4 {
     margin: 0;
     padding: 2px 0 4px;
-    font-size: 19px;
+    font-size: 18px;
     font-weight: 700;
 }
 
@@ -637,8 +627,8 @@ a[data-flickr-embed] img {
 .kg-image-card img {
     display: block;
     margin: 0 auto;
+    height: auto;
     width: auto;
-    height: auto !important;
 }
 
 .kg-bookmark-container {
@@ -1290,8 +1280,7 @@ a[data-flickr-embed] img {
     table.body p,
     table.body ul,
     table.body ol,
-    table.body td,
-    table.body span {
+    table.body td {
         font-size: 16px !important;
     }
 
@@ -1403,33 +1392,29 @@ a[data-flickr-embed] img {
     }
 
     table.body .latest-posts-header {
-        font-size: 14px !important;
-    }
-
-    table.body .latest-post-img {
-        display: none !important;
-    }
-
-    table.body .latest-post-img-mobile {
-        display: inline-block !important;
-        width: 100%;
+        font-size: 12px !important;
     }
 
     table.body .latest-post-title {
         display: inline-block !important;
         width: 100%;
-        padding-right: 0 !important;
-        padding-bottom: 8px !important;
+        padding-right: 8px !important;
     }
 
     table.body .latest-post h4, table.body .latest-post h4 span {
-        padding: 4px 0 !important;
-        font-size: 18px !important;
+        padding: 4px 0 6px !important;
+        font-size: 15px !important;
     }
 
-    table.body .latest-post p, table.body .latest-post p span {
+    table.body .latest-post-excerpt,
+    table.body .latest-post-excerpt a,
+    table.body .latest-post-excerpt span {
         font-size: 13px !important;
-        line-height: 1.25em;
+        line-height: 1.2 !important;
+    }
+
+    table.body .latest-post-excerpt span {
+        display: none !important;
     }
 
     table.body .subscription-box h3 {
@@ -1474,7 +1459,8 @@ a[data-flickr-embed] img {
         line-height: 1.3em !important;
     }
 
-    table.body h2 {
+    table.body h2,
+    table.body h2 span {
         font-size: 26px !important;
         line-height: 1.22em !important;
     }
@@ -1521,11 +1507,6 @@ a[data-flickr-embed] img {
         margin: 2em 0 !important;
     }
 
-    table.body figcaption,
-    table.body figcaption a {
-        font-size: 13px !important;
-    }
-
     table.body .kg-header-card.kg-v2 span {
         font-size: inherit !important;
     }
diff --git a/ghost/email-service/lib/email-templates/partials/styles.hbs b/ghost/email-service/lib/email-templates/partials/styles.hbs
index 4c36cd85057..6adb7aecb28 100644
--- a/ghost/email-service/lib/email-templates/partials/styles.hbs
+++ b/ghost/email-service/lib/email-templates/partials/styles.hbs
@@ -293,7 +293,7 @@ figure {
 figcaption {
     text-align: center;
     font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol';
-    font-size: 14px;
+    font-size: 13px;
     padding-top: 5px;
     line-height: 1.5em;
 }
@@ -514,7 +514,7 @@ figure blockquote p {
     margin: 0;
     padding: 8px 0 16px;
     color: {{titleColor}};
-    font-size: 14px;
+    font-size: 13px;
     font-weight: 700;
     text-transform: uppercase;
 }
@@ -536,20 +536,10 @@ figure blockquote p {
     text-decoration: none;
 }
 
-.latest-post-img img,
-.latest-post-img-mobile img {
+.latest-post-img img {
     object-fit: cover;
 }
 
-.latest-post-img-mobile {
-    display: none;
-}
-
-.latest-post-img-mobile img {
-    width: 100% !important;
-    height: auto !important; /* Make sure CSS ignores the height that is defined in HTML, but keep the aspect ratio from the width/height in HTML */
-}
-
 .latest-post-title {
     padding-right: 12px;
 }
@@ -557,7 +547,7 @@ figure blockquote p {
 .latest-post h4 {
     margin: 0;
     padding: 2px 0 4px;
-    font-size: 19px;
+    font-size: 18px;
     font-weight: 700;
 }
 
@@ -1367,8 +1357,7 @@ a[data-flickr-embed] img {
     table.body p,
     table.body ul,
     table.body ol,
-    table.body td,
-    table.body span {
+    table.body td {
         font-size: 16px !important;
     }
 
@@ -1485,33 +1474,29 @@ a[data-flickr-embed] img {
     }
 
     table.body .latest-posts-header {
-        font-size: 14px !important;
-    }
-
-    table.body .latest-post-img {
-        display: none !important;
-    }
-
-    table.body .latest-post-img-mobile {
-        display: inline-block !important;
-        width: 100%;
+        font-size: 12px !important;
     }
 
     table.body .latest-post-title {
         display: inline-block !important;
         width: 100%;
-        padding-right: 0 !important;
-        padding-bottom: 8px !important;
+        padding-right: 8px !important;
     }
 
     table.body .latest-post h4, table.body .latest-post h4 span {
-        padding: 4px 0 !important;
-        font-size: 18px !important;
+        padding: 4px 0 6px !important;
+        font-size: 15px !important;
     }
 
-    table.body .latest-post p, table.body .latest-post p span {
+    table.body .latest-post-excerpt,
+    table.body .latest-post-excerpt a,
+    table.body .latest-post-excerpt span {
         font-size: 13px !important;
-        line-height: 1.25em;
+        line-height: 1.2 !important;
+    }
+
+    table.body .latest-post-excerpt span {
+        display: none !important;
     }
 
     table.body .subscription-box h3 {
@@ -1556,7 +1541,8 @@ a[data-flickr-embed] img {
         line-height: 1.3em !important;
     }
 
-    table.body h2 {
+    table.body h2,
+    table.body h2 span {
         font-size: 26px !important;
         line-height: 1.22em !important;
     }
@@ -1602,12 +1588,6 @@ a[data-flickr-embed] img {
     table.body hr {
         margin: 2em 0 !important;
     }
-
-    table.body figcaption,
-    table.body figcaption a {
-        font-size: 13px !important;
-    }
-
 }
 
 /* -------------------------------------
diff --git a/ghost/email-service/package.json b/ghost/email-service/package.json
index 67a931e4359..514f04cd35d 100644
--- a/ghost/email-service/package.json
+++ b/ghost/email-service/package.json
@@ -19,20 +19,20 @@
   ],
   "devDependencies": {
     "c8": "8.0.1",
-    "html-validate": "8.7.0",
+    "html-validate": "8.7.1",
     "mocha": "10.2.0",
     "should": "13.2.3",
     "sinon": "15.2.0"
   },
   "dependencies": {
-    "@tryghost/color-utils": "0.1.24",
+    "@tryghost/color-utils": "0.2.0",
     "@tryghost/email-events": "0.0.0",
     "@tryghost/errors": "1.2.26",
     "@tryghost/html-to-plaintext": "0.0.0",
-    "@tryghost/kg-default-cards": "9.1.8",
+    "@tryghost/kg-default-cards": "9.1.9",
     "@tryghost/logging": "2.4.8",
-    "@tryghost/tpl": "0.1.24",
-    "@tryghost/validator": "0.2.4",
+    "@tryghost/tpl": "0.1.26",
+    "@tryghost/validator": "0.2.6",
     "bson-objectid": "2.0.4",
     "cheerio": "0.22.0",
     "handlebars": "4.7.8",
diff --git a/ghost/email-service/test/batch-sending-service.test.js b/ghost/email-service/test/batch-sending-service.test.js
index 7221ae84af8..59411f91e50 100644
--- a/ghost/email-service/test/batch-sending-service.test.js
+++ b/ghost/email-service/test/batch-sending-service.test.js
@@ -298,6 +298,10 @@ describe('Batch Sending Service', function () {
                 }));
 
                 const q = nql(filter);
+                // Check that the filter id:<${lastId} is a string
+                // In rare cases when the object ID is numeric, the query returns unexpected results
+                assert.equal(typeof q.toJSON().$and[1].id.$lt, 'string');
+
                 const all = members.filter((member) => {
                     return q.queryJSON(member.toJSON());
                 });
@@ -394,6 +398,10 @@ describe('Batch Sending Service', function () {
 
             Member.getFilteredCollectionQuery = ({filter}) => {
                 const q = nql(filter);
+                // Check that the filter id:<${lastId} is a string
+                // In rare cases when the object ID is numeric, the query returns unexpected results
+                assert.equal(typeof q.toJSON().$and[2].id.$lt, 'string');
+
                 const all = members.filter((member) => {
                     return q.queryJSON(member.toJSON());
                 });
@@ -451,6 +459,111 @@ describe('Batch Sending Service', function () {
             // Check email_count set
             assert.equal(email.get('email_count'), 4);
         });
+
+        // NOTE: we can't fully test this because javascript can't handle a large number (e.g. 650706040078550001536020) - it uses scientific notation
+        //  so we have to use a string
+        //  ref: https://ghost.slack.com/archives/CTH5NDJMS/p1699359241142969
+        it('sends expected emails if a batch ends on a numeric id', async function () {
+            const Member = createModelClass({});
+            const EmailBatch = createModelClass({});
+            const newsletter = createModel({});
+
+            const members = [
+                createModel({
+                    id: '61a55008a9d68c003baec6df',
+                    email: `test1@numericid.com`,
+                    uuid: 'test1',
+                    status: 'free',
+                    newsletters: [
+                        newsletter
+                    ]
+                }),
+                createModel({
+                    id: '650706040078550001536020', // numeric object id
+                    email: `test2@numericid.com`,
+                    uuid: 'test2',
+                    status: 'free',
+                    newsletters: [
+                        newsletter
+                    ]
+                }),
+                createModel({
+                    id: '65070957007855000153605b',
+                    email: `test3@numericid.com`,
+                    uuid: 'test3',
+                    status: 'free',
+                    newsletters: [
+                        newsletter
+                    ]
+                })
+            ];
+
+            const initialMembers = members.slice();
+
+            Member.getFilteredCollectionQuery = ({filter}) => {
+                const q = nql(filter);
+                // Check that the filter id:<${lastId} is a string
+                // In rare cases when the object ID is numeric, the query returns unexpected results
+                assert.equal(typeof q.toJSON().$and[2].id.$lt, 'string');
+
+                const all = members.filter((member) => {
+                    return q.queryJSON(member.toJSON());
+                });
+
+                // Sort all by id desc (string) - this is how we keep the order of members consistent (object id is a proxy for created_at)
+                all.sort((a, b) => {
+                    return b.id.localeCompare(a.id);
+                });
+
+                return createDb({
+                    all: all.map(member => member.toJSON())
+                });
+            };
+
+            const db = createDb({});
+            const insert = sinon.spy(db, 'insert');
+
+            const service = new BatchSendingService({
+                models: {Member, EmailBatch},
+                emailRenderer: {
+                    getSegments() {
+                        return ['status:free'];
+                    }
+                },
+                sendingService: {
+                    getMaximumRecipients() {
+                        return 2; // pick a batch size that ends with a numeric member object id
+                    }
+                },
+                emailSegmenter: {
+                    getMemberFilterForSegment(n, _, segment) {
+                        return `newsletters.id:${n.id}+(${segment})`;
+                    }
+                },
+                db
+            });
+
+            const email = createModel({});
+
+            const batches = await service.createBatches({
+                email,
+                post: createModel({}),
+                newsletter
+            });
+            assert.equal(batches.length, 2);
+
+            const calls = insert.getCalls();
+            assert.equal(calls.length, 2);
+
+            const insertedRecipients = calls.flatMap(call => call.args[0]);
+            assert.equal(insertedRecipients.length, 3);
+
+            // Check all recipients match initialMembers
+            assert.deepEqual(insertedRecipients.map(recipient => recipient.member_id).sort(), initialMembers.map(member => member.id).sort());
+
+            // Check email_count set
+            assert.equal(email.get('email_count'), 3);
+        });
     });
 
     describe('createBatch', function () {
diff --git a/ghost/i18n/lib/i18n.js b/ghost/i18n/lib/i18n.js
index d25d241dbd4..99ed1abe4d8 100644
--- a/ghost/i18n/lib/i18n.js
+++ b/ghost/i18n/lib/i18n.js
@@ -30,6 +30,7 @@ const SUPPORTED_LOCALES = [
     'ro', // Romanian
     'ru', // Russian
     'si', // Sinhala
+    'sk', // Slovak
     'sl', // Slovenian
     'sq', // Albanian
     'sr', // Serbian
diff --git a/ghost/i18n/locales/ja/ghost.json b/ghost/i18n/locales/ja/ghost.json
index 7788da40cd4..32eb63fcf96 100644
--- a/ghost/i18n/locales/ja/ghost.json
+++ b/ghost/i18n/locales/ja/ghost.json
@@ -13,7 +13,7 @@
     "If you did not make this request, you can safely ignore this email.": "このリクエストを行っていない場合は、このメールを無視してください。",
     "If you did not make this request, you can simply delete this message.": "このリクエストを行っていない場合は、このメールを削除してください。",
     "Please confirm your email address with this link:": "このリンクを使用してメールアドレスを確認してください：",
-    "Secure sign in link for {{siteTitle}}": "{{siteTitle}}への安全なログイン先リンク",
+    "Secure sign in link for {{siteTitle}}": "{{siteTitle}}へのログインリンクです",
     "See you soon!": "引き続きよろしくお願いします。",
     "Sent to {{email}}": "{{email}}に送信",
     "Sign in": "ログイン",
diff --git a/ghost/i18n/locales/no/ghost.json b/ghost/i18n/locales/no/ghost.json
index dd4c3e68c48..9179de44bcf 100644
--- a/ghost/i18n/locales/no/ghost.json
+++ b/ghost/i18n/locales/no/ghost.json
@@ -1,27 +1,27 @@
 {
     "All the best!": "Alt det beste!",
-    "Complete signup for {{siteTitle}}!": "",
+    "Complete signup for {{siteTitle}}!": "Fullfør påmelding for {{siteTitle}}!",
     "Complete your sign up to {{siteTitle}}!": "Fullfør registreringen din på {{siteTitle}}!",
-    "Confirm email address": "",
-    "Confirm signup": "",
-    "Confirm your email address": "",
+    "Confirm email address": "Bekreft epost",
+    "Confirm signup": "Bekreft påmelding",
+    "Confirm your email address": "Bekraft din epost",
     "Confirm your email update for {{siteTitle}}!": "Bekreft e-postoppdateringen din for {{siteTitle}}!",
     "Confirm your subscription to {{siteTitle}}": "Bekreft abonnementet ditt på {{siteTitle}}",
     "For your security, the link will expire in 24 hours time.": "For din sikkerhet så vil denne linken utløpe om 24 timer",
     "Hey there,": "Hei,",
-    "Hey there!": "",
+    "Hey there!": "Hei!",
     "If you did not make this request, you can safely ignore this email.": "Hvis du ikke har bedt om dette, kan du trygt ignorere denne e-posten.",
     "If you did not make this request, you can simply delete this message.": "Hvis du ikke har bedt om dette, kan du enkelt slette denne meldingen.",
     "Please confirm your email address with this link:": "Vennligst bekreft e-postadressen din med denne lenken:",
     "Secure sign in link for {{siteTitle}}": "Sikker påloggingslenke for {{siteTitle}}",
     "See you soon!": "Ser deg snart!",
     "Sent to {{email}}": "Send til {{email}}",
-    "Sign in": "",
+    "Sign in": "Logg inn",
     "Sign in to {{siteTitle}}": "Logg inn på {{siteTitle}}",
     "Tap the link below to complete the signup process for {{siteTitle}}, and be automatically signed in:": "Trykk på lenken nedenfor for å fullføre registreringsprosessen for {{siteTitle}}. Du blir automatisk logget på:",
     "Thank you for signing up to {{siteTitle}}!": "Takk for at du registrerte deg på {{siteTitle}}!",
     "Thank you for subscribing to {{siteTitle}}!": "Takk for at du abonnerer på {{siteTitle}}!",
-    "Thank you for subscribing to {{siteTitle}}.": "",
+    "Thank you for subscribing to {{siteTitle}}.": "Takk for at du abonnerer på {{siteTitle}}",
     "Thank you for subscribing to {{siteTitle}}. Tap the link below to be automatically signed in:": "Takk for at du abonnerer på {{siteTitle}}. Trykk på lenken nedenfor for å bli automatisk logget på:",
     "This email address will not be used.": "Denne e-postadressen vil ikke bli brukt.",
     "Welcome back to {{siteTitle}}!": "Velkommen tilbake til {{siteTitle}}!",
@@ -30,5 +30,5 @@
     "You will not be signed up, and no account will be created for you.": "Du vil ikke bli registrert, og ingen konto vil bli opprettet for deg.",
     "You will not be subscribed.": "Du vil ikke ble meldt på",
     "You're one tap away from subscribing to {{siteTitle}} — please confirm your email address with this link:": "Du er ett klikk unna fra å abonnere på {{siteTitle}} — bekreft e-postadressen din med denne lenken:",
-    "You're one tap away from subscribing to {{siteTitle}}!": ""
+    "You're one tap away from subscribing to {{siteTitle}}!": "Du er ett klikk unna fra å abonnere på {{siteTitle}}!"
 }
diff --git a/ghost/i18n/locales/no/portal.json b/ghost/i18n/locales/no/portal.json
index 3599d768399..41827d4c8f2 100644
--- a/ghost/i18n/locales/no/portal.json
+++ b/ghost/i18n/locales/no/portal.json
@@ -1,68 +1,68 @@
 {
-    "{{amount}} days free": "",
-    "{{amount}} off": "",
-    "{{amount}} off for first {{number}} months.": "",
-    "{{amount}} off for first {{period}}.": "",
-    "{{amount}} off forever.": "",
+    "{{amount}} days free": "{{amount}} dager gratis",
+    "{{amount}} off": "{{amount}} rabatt",
+    "{{amount}} off for first {{number}} months.": "{{amount}} rabatt første {{number}} måneder.",
+    "{{amount}} off for first {{period}}.": "{{amount}} rabatt den første {{period}}.",
+    "{{amount}} off forever.": "{{amount}} rabatt for alltid.",
     "{{discount}}% discount": "{{discount}}% rabatt",
-    "{{memberEmail}} will no longer receive {{newsletterName}} newsletter.": "",
-    "{{memberEmail}} will no longer receive emails when someone replies to your comments.": "",
-    "{{memberEmail}} will no longer receive this newsletter.": "",
+    "{{memberEmail}} will no longer receive {{newsletterName}} newsletter.": "{{memberEmail}} vil ikke lengre motta nyhetsbrevet {{newsletterName}}.",
+    "{{memberEmail}} will no longer receive emails when someone replies to your comments.": "{{memberEmail}} vil ikke lengre motta eposter når noen svarer på dine kommentarer.",
+    "{{memberEmail}} will no longer receive this newsletter.": "{{memberEmail}} vil ikke lengre motta nyhetsbrevet.",
     "{{trialDays}} days free": "{{trialDays}} dager gratis",
     "A login link has been sent to your inbox. If it doesn't arrive in 3 minutes, be sure to check your spam folder.": "En påloggingslenke har blitt sendt til innboksen din. Hvis den ikke kommer innen 3 minutter, må du sjekke søppelposten din.",
     "Account": "Konto",
     "Account settings": "Kontoinnstillinger",
-    "After a free trial ends, you will be charged the regular price for the tier you've chosen. You can always cancel before then.": "Etter at en gratis prøveperiode er over, vil du bli belastet den vanlige prisen for nivået du har valgt. Du kan alltid avbryte før det.",
+    "After a free trial ends, you will be charged the regular price for the tier you've chosen. You can always cancel before then.": "Etter at prøveperioden er over, vil du bli belastet den vanlige prisen for nivået du har valgt. Du kan alltid avbryte før det.",
     "Already a member?": "Allerede medlem?",
-    "An unexpected error occured. Please try again or <a>contact support</a> if the error persists.": "",
+    "An unexpected error occured. Please try again or <a>contact support</a> if the error persists.": "En uforutsett feil oppstod. Vennligst prøv igjen eller <a>ta kontakt</a> om feilen vedvarer.",
     "Back": "Tilbake",
-    "Back to Log in": "Tilbake til innlogging",
-    "Billing info": "",
+    "Back to Log in": "Tilbake til logginn",
+    "Billing info": "Fakturainformasjon",
     "Black Friday": "",
-    "Cancel anytime.": "",
+    "Cancel anytime.": "Ingen bindingstid",
     "Cancel subscription": "Avbryt abonnement",
     "Cancellation reason": "Grunn til avbryting",
-    "Change": "",
-    "Check spam & promotions folders": "",
-    "Check with your mail provider": "",
-    "Choose": "",
+    "Change": "Endre",
+    "Check spam & promotions folders": "Sjekk foldere for søppelpost og reklame",
+    "Check with your mail provider": "Ta kontakt med din epostleverandør",
+    "Choose": "Velg",
     "Choose a different plan": "Velg et annet nivå",
     "Choose your newsletters": "Velg dine nyhetsbrev",
-    "Click here to retry": "",
+    "Click here to retry": "Klikk her for å prøve igjen",
     "Close": "Lukk",
     "Comments": "Kommentarer",
-    "Complimentary": "",
+    "Complimentary": "Gratis",
     "Confirm": "Bekreft",
-    "Confirm cancellation": "",
-    "Confirm subscription": "",
+    "Confirm cancellation": "Bekreft kansellering",
+    "Confirm subscription": "Bekreft påmelding",
     "Contact support": "",
     "Continue": "Fortsett",
-    "Continue subscription": "",
-    "Could not sign in. Login link expired.": "",
-    "Could not update email! Invalid link.": "",
-    "Create a new contact": "",
-    "Current plan": "",
+    "Continue subscription": "Fortsett abonnement",
+    "Could not sign in. Login link expired.": "Kunne ikke logge på. Tiden for lenken har utgått.",
+    "Could not update email! Invalid link.": "Kunne ikke oppdatere epost! Ugyldig lenke.",
+    "Create a new contact": "Registrer en ny kontakt",
+    "Current plan": "Gjeldende plan",
     "Delete account": "Slett konto",
-    "Didn't mean to do this? Manage your preferences <button>here</button>.": "",
+    "Didn't mean to do this? Manage your preferences <button>here</button>.": "Var dett en feil? Du kan endre dine preferanser <button>her</button>",
     "Don't have an account?": "Har du ikke konto?",
-    "Edit": "",
+    "Edit": "Rediger",
     "Email": "Epost",
-    "Email newsletter": "",
+    "Email newsletter": "Epostbasert nyhetsbrev",
     "Email preference updated.": "Innstillinger for epost oppdatert",
     "Email preferences": "Innstillinger for epost",
     "Emails": "Epost",
     "Emails disabled": "Epost deaktivert",
-    "Ends {{offerEndDate}}": "",
-    "Error": "",
-    "Expires {{expiryDate}}": "",
-    "Forever": "",
-    "Free Trial – Ends {{trialEnd}}": "",
+    "Ends {{offerEndDate}}": "Avsluttes {{offerEndDate}}",
+    "Error": "Feil",
+    "Expires {{expiryDate}}": "Avsluttes {{expiryDate}}",
+    "Forever": "For alltid",
+    "Free Trial – Ends {{trialEnd}}": "Gratis prøveperiode – avsluttes {{trialEnd}}",
     "Get help": "Få hjelp",
-    "Get in touch for help": "",
+    "Get in touch for help": "Ta kontakt for hjelp",
     "Get notified when someone replies to your comment": "Få varsel dersom noen svarer på kommentaren din",
     "Give feedback on this post": "Gi tilbakemelding på dette innlegget",
-    "Help! I'm not receiving emails": "",
-    "Here are a few other sites you may enjoy.": "",
+    "Help! I'm not receiving emails": "Hjelp, jeg mottar ikke eposter",
+    "Here are a few other sites you may enjoy.": "Her en noen andre nettsteder du kan like.",
     "If a newsletter is flagged as spam, emails are automatically disabled for that address to make sure you no longer receive any unwanted messages.": "",
     "If the spam complaint was accidental, or you would like to begin receiving emails again, you can resubscribe to emails by clicking the button on the previous screen.": "",
     "If you cancel your subscription now, you will continue to have access until {{periodEnd}}.": "",
@@ -75,84 +75,84 @@
     "Less like this": "Mindre som dette",
     "Make sure emails aren't accidentally ending up in the Spam or Promotions folders of your inbox. If they are, click on \"Mark as not spam\" and/or \"Move to inbox\".": "",
     "Manage": "Administrer",
-    "Maybe later": "",
-    "Memberships unavailable, contact the owner for access.": "",
+    "Maybe later": "Kanskje senere",
+    "Memberships unavailable, contact the owner for access.": "Medlemskap ikke tilgjengelig, ta kontakt for tilgang.",
     "Monthly": "Månedlig",
     "More like this": "Mer som dette",
     "Name": "Navn",
-    "Need more help? Contact support": "",
+    "Need more help? Contact support": "Trenger du mer hjelp? Ta kontakt",
     "Newsletters can be disabled on your account for two reasons: A previous email was marked as spam, or attempting to send an email resulted in a permanent failure (bounce).": "",
     "Not receiving emails?": "Mottar du ikke epost?",
     "Now check your email!": "Sjekk eposten din!",
-    "Once resubscribed, if you still don't see emails in your inbox, check your spam folder. Some inbox providers keep a record of previous spam complaints and will continue to flag emails. If this happens, mark the latest newsletter as 'Not spam' to move it back to your primary inbox.": "",
-    "Permanent failure (bounce)": "",
-    "Plan": "",
-    "Plan checkout was cancelled.": "",
-    "Plan upgrade was cancelled.": "",
-    "Please contact {{supportAddress}} to adjust your complimentary subscription.": "",
-    "Please fill in required fields": "",
+    "Once resubscribed, if you still don't see emails in your inbox, check your spam folder. Some inbox providers keep a record of previous spam complaints and will continue to flag emails. If this happens, mark the latest newsletter as 'Not spam' to move it back to your primary inbox.": "Blir eposten markert som søppelpost? Sjekk epostfolderen for søppelpost og merk som 'ikke søppel'.",
+    "Permanent failure (bounce)": "Permanent feil (bounce)",
+    "Plan": "Plan",
+    "Plan checkout was cancelled.": "Påmelding til plan ble kansellert. ",
+    "Plan upgrade was cancelled.": "Oppgradering ble kansellert.",
+    "Please contact {{supportAddress}} to adjust your complimentary subscription.": "Vennligst kontakt {{supportAddress}} for å justere ditt gratis abonnement.",
+    "Please fill in required fields": "Vennligst fyll in påkrevde felt",
     "Price": "Pris",
     "Re-enable emails": "Re-aktiver epost",
-    "Recommendations": "",
-    "Renews at {{price}}.": "",
+    "Recommendations": "Anbefalinger",
+    "Renews at {{price}}.": "Fornyes til {{price}}.",
     "Retry": "Prøv på nytt",
     "Save": "Lagre",
-    "Send an email and say hi!": "",
+    "Send an email and say hi!": "Send en epost og si hei!",
     "Send an email to {{senderEmail}} and say hello. This can also help signal to your mail provider that emails to-and-from this address should be trusted.": "",
     "Sending login link...": "Sender påloggingslenke",
     "Sending...": "Sender...",
-    "Show all": "",
+    "Show all": "Vis alt",
     "Sign in": "Logg inn",
-    "Sign out": "",
+    "Sign out": "Logg ut",
     "Sign up": "Opprett bruker",
-    "Signup error: Invalid link": "",
-    "Sorry, that didn’t work.": "",
-    "Spam complaints": "",
+    "Signup error: Invalid link": "En feil oppstod: Ugyldig lenke",
+    "Sorry, that didn’t work.": "Beklager, det fungerte ikke",
+    "Spam complaints": "Klager om søppelpost",
     "Start {{amount}}-day free trial": "Start gratis prøveperiode på {{amount}} dager",
-    "Starting {{startDate}}": "",
-    "Starting today": "",
+    "Starting {{startDate}}": "Oppstartsdato {{startDate}}",
+    "Starting today": "Starter idag",
     "Submit feedback": "Send tilbakemelding",
-    "Subscribe": "",
-    "Subscribed": "",
-    "Success": "",
-    "Success! Check your email for magic link to sign-in.": "",
-    "Success! Your account is fully activated, you now have access to all content.": "",
-    "Success! Your email is updated.": "",
+    "Subscribe": "Påmelding",
+    "Subscribed": "Påmeldt",
+    "Success": "Suksess",
+    "Success! Check your email for magic link to sign-in.": "Suksess! Sjekk din epost for magisk lenke på pålogging.",
+    "Success! Your account is fully activated, you now have access to all content.": "Suksess! Din konto er nå aktivert, og du har tilgang til alt innhold.",
+    "Success! Your email is updated.": "Suksess, din epost er oppdatert",
     "Successfully unsubscribed": "Avmelding vellykket",
     "Thank you for subscribing. Before you start reading, below are a few other sites you may enjoy.": "",
     "Thanks for the feedback!": "Takk for tilbakemeldingen!",
     "That didn't go to plan": "Det gikk ikke som planlagt",
     "The email address we have for you is {{memberEmail}} — if that's not correct, you can update it in your <button>account settings area</button>.": "",
-    "There was a problem submitting your feedback. Please try again a little later.": "",
+    "There was a problem submitting your feedback. Please try again a little later.": "Det oppstod en feil. Vennligst prøv igjen senere.",
     "This site is invite-only, contact the owner for access.": "Denne siten er kun fo inviterte. Kontakt eieren for invitasjon.",
     "To complete signup, click the confirmation link in your inbox. If it doesn't arrive within 3 minutes, check your spam folder!": "For å fullføre registreringen, klikk på bekreftelseslenken i innboksen din. Hvis den ikke kommer innen 3 minutter, må du sjekke søppelposten din!",
     "Try free for {{amount}} days, then {{originalPrice}}.": "",
-    "Unlock access to all newsletters by becoming a paid subscriber.": "",
+    "Unlock access to all newsletters by becoming a paid subscriber.": "Få tilgang til alle nyhetsbrevene ved å oppgradere ditt abonnement.",
     "Unsubscribe from all emails": "Meld deg av mottak av all epost",
-    "Unsubscribed": "",
+    "Unsubscribed": "Avmeldt",
     "Unsubscribing from emails will not cancel your paid subscription to {{title}}": "Å melde seg av e-poster vil ikke avbryte abonnementet ditt på {{title}}",
-    "Update": "",
+    "Update": "Oppdater",
     "Update your preferences": "Oppdater dine valg",
-    "Verification link sent, check your inbox": "",
-    "Verify your email address is correct": "",
-    "View plans": "",
+    "Verification link sent, check your inbox": "Lenke for verifisering er sent. Sjekk innboksen din.",
+    "Verify your email address is correct": "Verifiser at eposten din er korrekt",
+    "View plans": "Se planer",
     "We couldn't unsubscribe you as the email address was not found. Please contact the site owner.": "Vi kunne ikke melde deg av siden e-postadressen ikke ble funnet. Vennligst kontakt nettstedseieren.",
-    "Welcome back, {{name}}!": "",
-    "Welcome back!": "",
-    "Welcome to {{siteTitle}}": "",
+    "Welcome back, {{name}}!": "Velkommen tilbake {{name}}!",
+    "Welcome back!": "Velkommen tilbake",
+    "Welcome to {{siteTitle}}": "Velkommen til {{siteTitle}}",
     "When an inbox fails to accept an email it is commonly called a bounce. In many cases, this can be temporary. However, in some cases, a bounced email can be returned as a permanent failure when an email address is invalid or non-existent.": "",
-    "Why has my email been disabled?": "",
+    "Why has my email been disabled?": "Hvorfor fungerer ikke min epost?",
     "Yearly": "Årlig",
-    "You currently have a free membership, upgrade to a paid subscription for full access.": "",
+    "You currently have a free membership, upgrade to a paid subscription for full access.": "Du har for tiden et gratis abonnement, oppgrader for full tilgang.",
     "You have been successfully resubscribed": "Du har blitt meldt på igjen",
-    "You're currently not receiving emails": "",
-    "You're not receiving emails": "",
+    "You're currently not receiving emails": "Du mottar for tiden ikke eposter",
+    "You're not receiving emails": "Du mottar ikke eppster",
     "You're not receiving emails because you either marked a recent message as spam, or because messages could not be delivered to your provided email address.": "Du mottar ikke e-post fordi du enten nylig har merket en melding som spam, eller fordi meldinger ikke kunne leveres til den oppgitte e-postadressen din.",
-    "You've successfully signed in.": "",
-    "You've successfully subscribed to": "",
+    "You've successfully signed in.": "Du har logged på igjen.",
+    "You've successfully subscribed to": "Du har meldt deg på",
     "Your account": "Din konto",
     "Your input helps shape what gets published.": "Din tilbakemelding bidrar til å forme hva som blir publisert.",
-    "Your subscription will expire on {{expiryDate}}": "",
-    "Your subscription will renew on {{renewalDate}}": "",
-    "Your subscription will start on {{subscriptionStart}}": ""
-}
+    "Your subscription will expire on {{expiryDate}}": "Ditt abonnement vil avsluttes den {{expiryDate}}",
+    "Your subscription will renew on {{renewalDate}}": "Ditt abonnemnet vil fornyes den {{renewalDate}}",
+    "Your subscription will start on {{subscriptionStart}}": "Ditt abonnement vil begynne den {{subscriptionStart}}"
+}
\ No newline at end of file
diff --git a/ghost/i18n/locales/ro/comments.json b/ghost/i18n/locales/ro/comments.json
index bcb0715d9a1..818fb97a3d2 100644
--- a/ghost/i18n/locales/ro/comments.json
+++ b/ghost/i18n/locales/ro/comments.json
@@ -1,73 +1,73 @@
 {
-    "{{amount}} characters left": "",
-    "{{amount}} comments": "",
-    "{{amount}} days ago": "",
-    "{{amount}} hours ago": "",
-    "{{amount}} minutes ago": "",
-    "{{amount}} months ago": "",
-    "{{amount}} more": "",
-    "{{amount}} seconds ago": "",
-    "{{amount}} weeks ago": "",
-    "{{amount}} years ago": "",
-    "1 comment": "",
-    "Add comment": "",
-    "Add context to your comment, share your name and expertise to foster a healthy discussion.": "",
-    "Add reply": "",
-    "Already a member?": "",
-    "Anonymous": "",
-    "Become a member of {{publication}} to start commenting.": "",
-    "Become a paid member of {{publication}} to start commenting.": "",
-    "Cancel": "",
-    "Comment": "",
-    "Complete your profile": "",
-    "Delete": "",
-    "Deleted member": "",
-    "Discussion": "",
-    "Edit": "",
-    "Edit this comment": "",
-    "Edited": "",
-    "Enter your name": "",
-    "Expertise": "",
-    "Founder @ Acme Inc": "",
-    "Full-time parent": "",
-    "Head of Marketing at Acme, Inc": "",
-    "Hide": "",
-    "Hide comment": "",
-    "Jamie Larson": "",
-    "Join the discussion": "",
-    "Just now": "",
-    "Local resident": "",
-    "Member discussion": "",
-    "Name": "",
-    "Neurosurgeon": "",
-    "One day ago": "",
-    "One hour ago": "",
-    "One minute ago": "",
-    "One month ago": "",
-    "One week ago": "",
-    "One year ago": "",
-    "Reply": "",
-    "Reply to comment": "",
-    "Report": "",
-    "Report comment": "",
-    "Report this comment": "",
-    "Report this comment?": "",
-    "Save": "",
-    "Sending": "",
-    "Sent": "",
-    "Show": "",
-    "Show {{amount}} more replies": "",
-    "Show {{amount}} previous comments": "",
-    "Show 1 more reply": "",
-    "Show 1 previous comment": "",
-    "Show comment": "",
-    "Sign in": "",
-    "Sign up now": "",
-    "Start the conversation": "",
-    "This comment has been hidden.": "",
-    "This comment has been removed.": "",
-    "Upgrade now": "",
-    "Yesterday": "",
-    "You want to report this comment?": "",
-    "Your request will be sent to the owner of this site.": ""
+    "{{amount}} characters left": "{{amount}} caractere rămase",
+    "{{amount}} comments": "{{amount}} comentarii",
+    "{{amount}} days ago": "acum {{amount}} zile",
+    "{{amount}} hours ago": "acum {{amount}} ore",
+    "{{amount}} minutes ago": "acum {{amount}} minute",
+    "{{amount}} months ago": "acum {{amount}} luni",
+    "{{amount}} more": "încă {{amount}}",
+    "{{amount}} seconds ago": "acum {{amount}} secunde",
+    "{{amount}} weeks ago": "acum {{amount}} săptămâni",
+    "{{amount}} years ago": "acum {{amount}} ani",
+    "1 comment": "1 comentariu",
+    "Add comment": "Adaugă comentariu",
+    "Add context to your comment, share your name and expertise to foster a healthy discussion.": "Adăugați context comentariului dumneavoastră, împărtășiți-vă numele și expertiza pentru a favoriza o discuție sănătoasă.",
+    "Add reply": "Adaugă răspuns",
+    "Already a member?": "Deja membru?",
+    "Anonymous": "Anonim",
+    "Become a member of {{publication}} to start commenting.": "Deveniți membru al {{publication}} pentru a începe să comentați.",
+    "Become a paid member of {{publication}} to start commenting.": "Deveniți membru plătit al {{publication}} pentru a începe să comentați.",
+    "Cancel": "Anulează",
+    "Comment": "Comentează",
+    "Complete your profile": "Completează-ți profilul",
+    "Delete": "Șterge",
+    "Deleted member": "Membru șters",
+    "Discussion": "Discuție",
+    "Edit": "Editează",
+    "Edit this comment": "Editează acest comentariu",
+    "Edited": "Editat",
+    "Enter your name": "Introduceți numele dumneavoastră",
+    "Expertise": "Expertiză",
+    "Founder @ Acme Inc": "Fondator @ Acme Inc",
+    "Full-time parent": "Părinte cu normă întreagă",
+    "Head of Marketing at Acme, Inc": "Șef de Marketing la Acme, Inc",
+    "Hide": "Ascunde",
+    "Hide comment": "Ascunde comentariul",
+    "Jamie Larson": "Jamie Larson",
+    "Join the discussion": "Alătură-te discuției",
+    "Just now": "Chiar acum",
+    "Local resident": "Rezident local",
+    "Member discussion": "Discuție membrilor",
+    "Name": "Nume",
+    "Neurosurgeon": "Neurochirurg",
+    "One day ago": "Acum o zi",
+    "One hour ago": "Acum o oră",
+    "One minute ago": "Acum un minut",
+    "One month ago": "Acum o lună",
+    "One week ago": "Acum o săptămână",
+    "One year ago": "Acum un an",
+    "Reply": "Răspunde",
+    "Reply to comment": "Răspunde la comentariu",
+    "Report": "Raportează",
+    "Report comment": "Raportează comentariul",
+    "Report this comment": "Raportează acest comentariu",
+    "Report this comment?": "Raportezi acest comentariu?",
+    "Save": "Salvează",
+    "Sending": "Se trimite",
+    "Sent": "Trimis",
+    "Show": "Arată",
+    "Show {{amount}} more replies": "Arată încă {{amount}} răspunsuri",
+    "Show {{amount}} previous comments": "Arată {{amount}} comentarii anterioare",
+    "Show 1 more reply": "Arată încă un răspuns",
+    "Show 1 previous comment": "Arată un comentariu anterior",
+    "Show comment": "Arată comentariul",
+    "Sign in": "Autentificare",
+    "Sign up now": "Înregistrează-te acum",
+    "Start the conversation": "Începe conversația",
+    "This comment has been hidden.": "Acest comentariu a fost ascuns.",
+    "This comment has been removed.": "Acest comentariu a fost eliminat.",
+    "Upgrade now": "Actualizează acum",
+    "Yesterday": "Ieri",
+    "You want to report this comment?": "Dorești să raportezi acest comentariu?",
+    "Your request will be sent to the owner of this site.": "Cererea dumneavoastră va fi trimisă proprietarului acestui site."
 }
diff --git a/ghost/i18n/locales/ro/ghost.json b/ghost/i18n/locales/ro/ghost.json
index 0b94bc185bb..81a951d0fe1 100644
--- a/ghost/i18n/locales/ro/ghost.json
+++ b/ghost/i18n/locales/ro/ghost.json
@@ -1,27 +1,27 @@
 {
     "All the best!": "Toate cele bune!",
-    "Complete signup for {{siteTitle}}!": "",
+    "Complete signup for {{siteTitle}}!": "Completează înregistrarea pentru {{siteTitle}}!",
     "Complete your sign up to {{siteTitle}}!": "Finalizează înregistrarea la {{siteTitle}}!",
-    "Confirm email address": "",
-    "Confirm signup": "",
-    "Confirm your email address": "",
+    "Confirm email address": "Confirmă adresa de email",
+    "Confirm signup": "Confirmă înregistrarea",
+    "Confirm your email address": "Confirmă-ți adresa de email",
     "Confirm your email update for {{siteTitle}}!": "Confirmă actualizarea adresei tale de email pentru {{siteTitle}}!",
     "Confirm your subscription to {{siteTitle}}": "Confirmă abonamentul tău la {{siteTitle}}",
     "For your security, the link will expire in 24 hours time.": "Pentru siguranța ta, link-ul va expira în 24 de ore.",
     "Hey there,": "Bună,",
-    "Hey there!": "",
+    "Hey there!": "Salut!",
     "If you did not make this request, you can safely ignore this email.": "Dacă nu ai făcut această solicitare, poți ignora în siguranță acest email.",
     "If you did not make this request, you can simply delete this message.": "Dacă nu ai făcut această solicitare, poți șterge pur și simplu acest mesaj.",
     "Please confirm your email address with this link:": "Te rugăm să confirmi adresa ta de email cu acest link:",
     "Secure sign in link for {{siteTitle}}": "Link securizat pentru autentificarea la {{siteTitle}}",
     "See you soon!": "Pe curând!",
     "Sent to {{email}}": "Trimis către {{email}}",
-    "Sign in": "",
+    "Sign in": "Autentificare",
     "Sign in to {{siteTitle}}": "Conectează-te la {{siteTitle}}",
     "Tap the link below to complete the signup process for {{siteTitle}}, and be automatically signed in:": "Apasă pe link-ul de mai jos pentru a finaliza procesul de înregistrare la {{siteTitle}} și pentru a fi conectat automat:",
     "Thank you for signing up to {{siteTitle}}!": "Îți mulțumim că te-ai înregistrat la {{siteTitle}}!",
     "Thank you for subscribing to {{siteTitle}}!": "Îți mulțumim că te-ai abonat la {{siteTitle}}!",
-    "Thank you for subscribing to {{siteTitle}}.": "",
+    "Thank you for subscribing to {{siteTitle}}.": "Îți mulțumim pentru abonarea la {{siteTitle}}.",
     "Thank you for subscribing to {{siteTitle}}. Tap the link below to be automatically signed in:": "Îți mulțumim că te-ai abonat la {{siteTitle}}. Apasă pe link-ul de mai jos pentru a fi conectat automat:",
     "This email address will not be used.": "Această adresă de email nu va fi utilizată.",
     "Welcome back to {{siteTitle}}!": "Bine ai revenit la {{siteTitle}}!",
@@ -30,5 +30,5 @@
     "You will not be signed up, and no account will be created for you.": "Nu vei fi înregistrat și nu se va crea niciun cont pentru tine.",
     "You will not be subscribed.": "Nu vei fi abonat.",
     "You're one tap away from subscribing to {{siteTitle}} — please confirm your email address with this link:": "Ești la un pas de a te abona la {{siteTitle}} — te rugăm să confirmi adresa ta de email cu acest link:",
-    "You're one tap away from subscribing to {{siteTitle}}!": ""
+    "You're one tap away from subscribing to {{siteTitle}}!": "Ești la un singur pas de a te abona la {{siteTitle}}!"
 }
diff --git a/ghost/i18n/locales/ro/portal.json b/ghost/i18n/locales/ro/portal.json
index 8674bfcc5e3..ee24e572b11 100644
--- a/ghost/i18n/locales/ro/portal.json
+++ b/ghost/i18n/locales/ro/portal.json
@@ -1,158 +1,158 @@
 {
-    "{{amount}} days free": "",
-    "{{amount}} off": "",
-    "{{amount}} off for first {{number}} months.": "",
-    "{{amount}} off for first {{period}}.": "",
-    "{{amount}} off forever.": "",
+    "{{amount}} days free": "{{amount}} zile gratis",
+    "{{amount}} off": "{{amount}} redus",
+    "{{amount}} off for first {{number}} months.": "{{amount}} redus pentru primele {{number}} luni.",
+    "{{amount}} off for first {{period}}.": "{{amount}} redus pentru prima {{period}}.",
+    "{{amount}} off forever.": "{{amount}} redus pentru totdeauna",
     "{{discount}}% discount": "Reducere de {{discount}}%",
-    "{{memberEmail}} will no longer receive {{newsletterName}} newsletter.": "",
-    "{{memberEmail}} will no longer receive emails when someone replies to your comments.": "",
-    "{{memberEmail}} will no longer receive this newsletter.": "",
+    "{{memberEmail}} will no longer receive {{newsletterName}} newsletter.": "{{memberEmail}} nu va mai primi newsletterul {{newsletterName}}.",
+    "{{memberEmail}} will no longer receive emails when someone replies to your comments.": "{{memberEmail}} nu va mai primi emailuri atunci când cineva răspunde la comentariile tale.",
+    "{{memberEmail}} will no longer receive this newsletter.": "{{memberEmail}} nu va mai primi acest newsletter.",
     "{{trialDays}} days free": "{{trialDays}} zile gratuite",
     "A login link has been sent to your inbox. If it doesn't arrive in 3 minutes, be sure to check your spam folder.": "Un link de autentificare a fost trimis în inbox-ul tău. Dacă nu ajunge în 3 minute, asigură-te că verifici folderul de spam.",
     "Account": "Cont",
     "Account settings": "Setări cont",
     "After a free trial ends, you will be charged the regular price for the tier you've chosen. You can always cancel before then.": "După ce expiră perioada de încercare gratuită, vei fi taxat la prețul obișnuit pentru nivelul pe care l-ai ales. Poți anula în orice moment înainte de aceasta.",
     "Already a member?": "Ești deja membru?",
-    "An unexpected error occured. Please try again or <a>contact support</a> if the error persists.": "",
+    "An unexpected error occured. Please try again or <a>contact support</a> if the error persists.": "A apărut o eroare neașteptată. Te rog încearcă din nou sau <a>contactează suportul</a> dacă eroarea persistă.",
     "Back": "Înapoi",
     "Back to Log in": "Înapoi la Autentificare",
-    "Billing info": "",
-    "Black Friday": "",
-    "Cancel anytime.": "",
+    "Billing info": "Informații de facturare",
+    "Black Friday": "Black Friday",
+    "Cancel anytime.": "Anulează oricând",
     "Cancel subscription": "Anulează abonamentul",
     "Cancellation reason": "Motivul anulării",
-    "Change": "",
-    "Check spam & promotions folders": "",
-    "Check with your mail provider": "",
-    "Choose": "",
+    "Change": "Schimbă",
+    "Check spam & promotions folders": "Verifică dosarele spam & promoții",
+    "Check with your mail provider": "Verifică cu furnizorul tău de email",
+    "Choose": "Alege",
     "Choose a different plan": "Alege un plan diferit",
     "Choose your newsletters": "Alege-ți newsletterele",
-    "Click here to retry": "",
+    "Click here to retry": "Clic aici pentru a reîncerca",
     "Close": "Închide",
     "Comments": "Comentarii",
-    "Complimentary": "",
+    "Complimentary": "Complimentar",
     "Confirm": "Confirmă",
-    "Confirm cancellation": "",
-    "Confirm subscription": "",
-    "Contact support": "",
+    "Confirm cancellation": "Confirmă anularea",
+    "Confirm subscription": "Confirmă abonamentul",
+    "Contact support": "Contactează suportul",
     "Continue": "Continuă",
-    "Continue subscription": "",
-    "Could not sign in. Login link expired.": "",
-    "Could not update email! Invalid link.": "",
-    "Create a new contact": "",
-    "Current plan": "",
+    "Continue subscription": "Continuă abonamentul",
+    "Could not sign in. Login link expired.": "Nu s-a putut autentifica. Link-ul de autentificare a expirat.",
+    "Could not update email! Invalid link.": "Nu s-a putut actualiza emailul! Link invalid.",
+    "Create a new contact": "Creează un nou contact",
+    "Current plan": "Planul curent",
     "Delete account": "Șterge contul",
-    "Didn't mean to do this? Manage your preferences <button>here</button>.": "",
+    "Didn't mean to do this? Manage your preferences <button>here</button>.": "Nu ai intenționat acest lucru? Îți poți gestiona preferințele <button>aici</button>.",
     "Don't have an account?": "Nu ai un cont?",
-    "Edit": "",
+    "Edit": "Editează",
     "Email": "Email",
-    "Email newsletter": "",
-    "Email preference updated.": "Preferințele de email au fost actualizate.",
-    "Email preferences": "Preferințe de email",
+    "Email newsletter": "Newsletter prin email",
+    "Email preference updated.": "Preferința de email a fost actualizată.",
+    "Email preferences": "Preferințe email",
     "Emails": "Emailuri",
     "Emails disabled": "Emailuri dezactivate",
-    "Ends {{offerEndDate}}": "",
-    "Error": "",
-    "Expires {{expiryDate}}": "",
-    "Forever": "",
-    "Free Trial – Ends {{trialEnd}}": "",
+    "Ends {{offerEndDate}}": "Se termină {{offerEndDate}}",
+    "Error": "Eroare",
+    "Expires {{expiryDate}}": "Expiră {{expiryDate}}",
+    "Forever": "Pentru totdeauna",
+    "Free Trial – Ends {{trialEnd}}": "Perioadă de probă gratuită - Se încheie {{trialEnd}}",
     "Get help": "Obține ajutor",
-    "Get in touch for help": "",
+    "Get in touch for help": "Ia legătura pentru ajutor",
     "Get notified when someone replies to your comment": "Primește notificare când cineva răspunde la comentariul tău",
-    "Give feedback on this post": "Oferă feedback despre acest articol",
-    "Help! I'm not receiving emails": "",
-    "Here are a few other sites you may enjoy.": "",
-    "If a newsletter is flagged as spam, emails are automatically disabled for that address to make sure you no longer receive any unwanted messages.": "",
-    "If the spam complaint was accidental, or you would like to begin receiving emails again, you can resubscribe to emails by clicking the button on the previous screen.": "",
-    "If you cancel your subscription now, you will continue to have access until {{periodEnd}}.": "",
-    "If you have a corporate or government email account, reach out to your IT department and ask them to allow emails to be received from {{senderEmail}}": "",
-    "If you would like to start receiving emails again, the best next steps are to check your email address on file for any issues and then click resubscribe on the previous screen.": "",
-    "If you're not receiving the email newsletter you've subscribed to, here are few things to check.": "",
-    "If you've completed all these checks and you're still not receiving emails, you can reach out to get support by contacting {{supportAddress}}.": "",
-    "In the event a permanent failure is received when attempting to send a newsletter, emails will be disabled on the account.": "",
-    "In your email client add {{senderEmail}} to your contacts list. This signals to your mail provider that emails sent from this address should be trusted.": "",
+    "Give feedback on this post": "Oferă feedback pentru acest post",
+    "Help! I'm not receiving emails": "Ajutor! Nu primesc emailuri",
+    "Here are a few other sites you may enjoy.": "Iată câteva alte site-uri care s-ar putea să-ți placă.",
+    "If a newsletter is flagged as spam, emails are automatically disabled for that address to make sure you no longer receive any unwanted messages.": "Dacă un newsletter este marcat ca spam, emailurile sunt automat dezactivate pentru acea adresă pentru a te asigura că nu mai primești mesaje nedorite.",
+    "If the spam complaint was accidental, or you would like to begin receiving emails again, you can resubscribe to emails by clicking the button on the previous screen.": "Dacă sesizarea privind spam-ul a fost accidentală, sau doriți să începeți din nou să primiți emailuri, vă puteți reabona la emailuri făcând clic pe butonul de pe ecranul anterior.",
+    "If you cancel your subscription now, you will continue to have access until {{periodEnd}}.": "Dacă anulați abonamentul acum, veți continua să aveți acces până la {{periodEnd}}.",
+    "If you have a corporate or government email account, reach out to your IT department and ask them to allow emails to be received from {{senderEmail}}": "Dacă aveți un cont de email corporativ sau guvernamental, contactați departamentul IT și cereți-le să permită primirea emailurilor de la {{senderEmail}}",
+    "If you would like to start receiving emails again, the best next steps are to check your email address on file for any issues and then click resubscribe on the previous screen.": "Dacă doriți să începeți să primiți din nou emailuri, cei mai buni pași următori sunt să verificați adresa dvs. de email din fișiere pentru orice probleme și apoi să faceți clic pe reabonare pe ecranul anterior.",
+    "If you're not receiving the email newsletter you've subscribed to, here are few things to check.": "Dacă nu primiți buletinul informativ pe email la care v-ați abonat, iată câteva lucruri de verificat.",
+    "If you've completed all these checks and you're still not receiving emails, you can reach out to get support by contacting {{supportAddress}}.": "Dacă ați completat toate aceste verificări și încă nu primiți emailuri, puteți solicita suport contactând {{supportAddress}}.",
+    "In the event a permanent failure is received when attempting to send a newsletter, emails will be disabled on the account.": "În cazul în care se primește o eroare permanentă la încercarea de a trimite un buletin informativ, emailurile vor fi dezactivate pe cont.",
+    "In your email client add {{senderEmail}} to your contacts list. This signals to your mail provider that emails sent from this address should be trusted.": "În clientul dvs. de email adăugați {{senderEmail}} în lista de contacte. Acest lucru indică furnizorului dvs. de email că emailurile trimise de la această adresă ar trebui considerate de încredere.",
     "Less like this": "Mai puțin de genul acesta",
-    "Make sure emails aren't accidentally ending up in the Spam or Promotions folders of your inbox. If they are, click on \"Mark as not spam\" and/or \"Move to inbox\".": "",
+    "Make sure emails aren't accidentally ending up in the Spam or Promotions folders of your inbox. If they are, click on \"Mark as not spam\" and/or \"Move to inbox\".": "Asigurați-vă că emailurile nu ajung accidental în folderele Spam sau Promoții ale inbox-ului dvs. Dacă da, faceți clic pe \"Marchează ca fiind nesolicitat\" și/sau \"Mută în inbox\".",
     "Manage": "Administrează",
-    "Maybe later": "",
-    "Memberships unavailable, contact the owner for access.": "",
+    "Maybe later": "Poate mai târziu",
+    "Memberships unavailable, contact the owner for access.": "Membriile nu sunt disponibile, contactați proprietarul pentru acces.",
     "Monthly": "Lunar",
     "More like this": "Mai multe de genul acesta",
     "Name": "Nume",
-    "Need more help? Contact support": "",
-    "Newsletters can be disabled on your account for two reasons: A previous email was marked as spam, or attempting to send an email resulted in a permanent failure (bounce).": "",
+    "Need more help? Contact support": "Aveți nevoie de mai mult ajutor? Contactați suportul",
+    "Newsletters can be disabled on your account for two reasons: A previous email was marked as spam, or attempting to send an email resulted in a permanent failure (bounce).": "Buletinele informative pot fi dezactivate pe contul dvs. din două motive: Un email anterior a fost marcat ca spam, sau încercarea de a trimite un email a rezultat într-o eroare permanentă (respins).",
     "Not receiving emails?": "Nu primești emailuri?",
     "Now check your email!": "Acum verifică-ți emailul!",
-    "Once resubscribed, if you still don't see emails in your inbox, check your spam folder. Some inbox providers keep a record of previous spam complaints and will continue to flag emails. If this happens, mark the latest newsletter as 'Not spam' to move it back to your primary inbox.": "",
-    "Permanent failure (bounce)": "",
-    "Plan": "",
-    "Plan checkout was cancelled.": "",
-    "Plan upgrade was cancelled.": "",
-    "Please contact {{supportAddress}} to adjust your complimentary subscription.": "",
-    "Please fill in required fields": "",
+    "Once resubscribed, if you still don't see emails in your inbox, check your spam folder. Some inbox providers keep a record of previous spam complaints and will continue to flag emails. If this happens, mark the latest newsletter as 'Not spam' to move it back to your primary inbox.": "Odată reabonat, dacă încă nu vedeți emailuri în inbox, verificați dosarul de spam. Unii furnizori de inbox păstrează un istoric al sesizărilor de spam anterioare și vor continua să marcheze emailurile. Dacă se întâmplă acest lucru, marcați cel mai recent buletin informativ ca 'Nu este spam' pentru a-l muta înapoi în inbox-ul primar.",
+    "Permanent failure (bounce)": "Eroare permanentă (respins)",
+    "Plan": "Plan",
+    "Plan checkout was cancelled.": "Finalizarea planului a fost anulată.",
+    "Plan upgrade was cancelled.": "Actualizarea planului a fost anulată.",
+    "Please contact {{supportAddress}} to adjust your complimentary subscription.": "Vă rugăm să contactați {{supportAddress}} pentru a ajusta abonamentul dvs. gratuit.",
+    "Please fill in required fields": "Vă rugăm să completați câmpurile necesare",
     "Price": "Preț",
     "Re-enable emails": "Activează din nou emailurile",
-    "Recommendations": "",
-    "Renews at {{price}}.": "",
+    "Recommendations": "Recomandări",
+    "Renews at {{price}}.": "Se reînnoiește la {{price}}.",
     "Retry": "Reîncearcă",
     "Save": "Salvează",
-    "Send an email and say hi!": "",
-    "Send an email to {{senderEmail}} and say hello. This can also help signal to your mail provider that emails to-and-from this address should be trusted.": "",
+    "Send an email and say hi!": "Trimite un email și spune salut!",
+    "Send an email to {{senderEmail}} and say hello. This can also help signal to your mail provider that emails to-and-from this address should be trusted.": "Trimiteți un email la {{senderEmail}} și spuneți bună ziua. Acest lucru poate ajuta, de asemenea, să semnalizeze furnizorului dvs. de email că emailurile de la și către această adresă ar trebui considerate de încredere.",
     "Sending login link...": "Se trimite link-ul de autentificare...",
     "Sending...": "Se trimite...",
-    "Show all": "",
+    "Show all": "Arată tot",
     "Sign in": "Autentificare",
-    "Sign out": "",
+    "Sign out": "Deconectare",
     "Sign up": "Înregistrare",
-    "Signup error: Invalid link": "",
-    "Sorry, that didn’t work.": "",
-    "Spam complaints": "",
+    "Signup error: Invalid link": "Eroare la înregistrare: Link invalid",
+    "Sorry, that didn’t work.": "Ne pare rău, nu a funcționat.",
+    "Spam complaints": "Reclamații spam",
     "Start {{amount}}-day free trial": "Începe perioada gratuită de {{amount}} zile",
-    "Starting {{startDate}}": "",
-    "Starting today": "",
+    "Starting {{startDate}}": "Începând cu {{startDate}}",
+    "Starting today": "Începând de astăzi",
     "Submit feedback": "Trimite feedback",
-    "Subscribe": "",
-    "Subscribed": "",
-    "Success": "",
-    "Success! Check your email for magic link to sign-in.": "",
-    "Success! Your account is fully activated, you now have access to all content.": "",
-    "Success! Your email is updated.": "",
+    "Subscribe": "Abonează-te",
+    "Subscribed": "Abonat",
+    "Success": "Succes",
+    "Success! Check your email for magic link to sign-in.": "Succes! Verifică-ți emailul pentru link-ul magic de autentificare.",
+    "Success! Your account is fully activated, you now have access to all content.": "Succes! Contul tău este complet activat, acum ai acces la tot conținutul.",
+    "Success! Your email is updated.": "Succes! Emailul tău a fost actualizat.",
     "Successfully unsubscribed": "Dezabonare realizată cu succes",
-    "Thank you for subscribing. Before you start reading, below are a few other sites you may enjoy.": "",
+    "Thank you for subscribing. Before you start reading, below are a few other sites you may enjoy.": "Îți mulțumim pentru abonare. Înainte să începi să citești, iată câteva alte site-uri care s-ar putea să-ți placă.",
     "Thanks for the feedback!": "Mulțumim pentru feedback!",
     "That didn't go to plan": "Asta nu a mers conform planului",
-    "The email address we have for you is {{memberEmail}} — if that's not correct, you can update it in your <button>account settings area</button>.": "",
-    "There was a problem submitting your feedback. Please try again a little later.": "",
+    "The email address we have for you is {{memberEmail}} — if that's not correct, you can update it in your <button>account settings area</button>.": "Adresa de email pe care o avem pentru tine este {{memberEmail}} — dacă nu este corectă, o poți actualiza în <button>zona de setări a contului</button>.",
+    "There was a problem submitting your feedback. Please try again a little later.": "A fost o problemă cu trimiterea feedback-ului tău. Te rog încearcă din nou puțin mai târziu.",
     "This site is invite-only, contact the owner for access.": "Acest site este disponibil doar pe bază de invitație, contactează proprietarul pentru acces.",
     "To complete signup, click the confirmation link in your inbox. If it doesn't arrive within 3 minutes, check your spam folder!": "Pentru a finaliza înregistrarea, apasă pe link-ul de confirmare din inbox-ul tău. Dacă nu ajunge în 3 minute, verifică folderul de spam!",
-    "Try free for {{amount}} days, then {{originalPrice}}.": "",
-    "Unlock access to all newsletters by becoming a paid subscriber.": "",
+    "Try free for {{amount}} days, then {{originalPrice}}.": "Încearcă gratuit pentru {{amount}} zile, apoi {{originalPrice}}.",
+    "Unlock access to all newsletters by becoming a paid subscriber.": "Deblochează accesul la toate buletinele informative devenind un abonat plătit.",
     "Unsubscribe from all emails": "Dezabonează-te de la toate emailurile",
-    "Unsubscribed": "",
+    "Unsubscribed": "Dezabonat",
     "Unsubscribing from emails will not cancel your paid subscription to {{title}}": "Dezabonarea de la emailuri nu va anula abonamentul plătit la {{title}}",
-    "Update": "",
+    "Update": "Actualizează",
     "Update your preferences": "Actualizează-ți preferințele",
-    "Verification link sent, check your inbox": "",
-    "Verify your email address is correct": "",
-    "View plans": "",
+    "Verification link sent, check your inbox": "Link-ul de verificare a fost trimis, verifică-ți inboxul",
+    "Verify your email address is correct": "Verifică dacă adresa ta de email este corectă",
+    "View plans": "Vezi planurile",
     "We couldn't unsubscribe you as the email address was not found. Please contact the site owner.": "Nu am putut să te dezabonăm deoarece adresa de email nu a fost găsită. Te rugăm să contactezi proprietarul site-ului.",
-    "Welcome back, {{name}}!": "",
-    "Welcome back!": "",
-    "Welcome to {{siteTitle}}": "",
-    "When an inbox fails to accept an email it is commonly called a bounce. In many cases, this can be temporary. However, in some cases, a bounced email can be returned as a permanent failure when an email address is invalid or non-existent.": "",
-    "Why has my email been disabled?": "",
+    "Welcome back, {{name}}!": "Bun revenit, {{name}}!",
+    "Welcome back!": "Bun revenit!",
+    "Welcome to {{siteTitle}}": "Bun venit la {{siteTitle}}",
+    "When an inbox fails to accept an email it is commonly called a bounce. In many cases, this can be temporary. However, in some cases, a bounced email can be returned as a permanent failure when an email address is invalid or non-existent.": "Când o cutie poștală eșuează în a accepta un email, acesta este de obicei numit un bounce. În multe cazuri, acesta poate fi temporar. Totuși, în unele cazuri, un email returnat poate fi considerat o defecțiune permanentă când o adresă de email este invalidă sau inexistență.",
+    "Why has my email been disabled?": "De ce a fost dezactivat emailul meu?",
     "Yearly": "Anual",
-    "You currently have a free membership, upgrade to a paid subscription for full access.": "",
+    "You currently have a free membership, upgrade to a paid subscription for full access.": "În prezent ai o membră tate gratuită, upgradează la un abonament plătit pentru acces complet.",
     "You have been successfully resubscribed": "Te-ai reabonat cu succes",
-    "You're currently not receiving emails": "",
-    "You're not receiving emails": "",
+    "You're currently not receiving emails": "În prezent nu primești emailuri",
+    "You're not receiving emails": "Nu primești emailuri",
     "You're not receiving emails because you either marked a recent message as spam, or because messages could not be delivered to your provided email address.": "Nu primești emailuri deoarece fie ai marcat un mesaj recent ca spam, fie pentru că mesajele nu pot fi livrate la adresa ta de email furnizată.",
-    "You've successfully signed in.": "",
-    "You've successfully subscribed to": "",
+    "You've successfully signed in.": "Te-ai autentificat cu succes.",
+    "You've successfully subscribed to": "Te-ai abonat cu succes la",
     "Your account": "Contul tău",
     "Your input helps shape what gets published.": "Contribuția ta ajută la conturarea a ceea ce se publică.",
-    "Your subscription will expire on {{expiryDate}}": "",
-    "Your subscription will renew on {{renewalDate}}": "",
-    "Your subscription will start on {{subscriptionStart}}": ""
+    "Your subscription will expire on {{expiryDate}}": "Abonamentul tău va expira pe {{expiryDate}}",
+    "Your subscription will renew on {{renewalDate}}": "Abonamentul tău se va reînnoi pe {{renewalDate}}",
+    "Your subscription will start on {{subscriptionStart}}": "Abonamentul tău va începe pe {{subscriptionStart}}"
 }
diff --git a/ghost/i18n/locales/ro/signup-form.json b/ghost/i18n/locales/ro/signup-form.json
index cc957d9d0d1..468075ecaff 100644
--- a/ghost/i18n/locales/ro/signup-form.json
+++ b/ghost/i18n/locales/ro/signup-form.json
@@ -1,9 +1,9 @@
 {
-    "Email sent": "",
-    "Now check your email!": "",
-    "Please enter a valid email address": "",
-    "Something went wrong, please try again.": "",
-    "Subscribe": "",
-    "To complete signup, click the confirmation link in your inbox. If it doesn't arrive within 3 minutes, check your spam folder!": "",
-    "Your email address": ""
+    "Email sent": "Email trimis",
+    "Now check your email!": "Acum verifică-ți emailul!",
+    "Please enter a valid email address": "Te rog să introduci o adresă de email validă",
+    "Something went wrong, please try again.": "Ceva nu a funcționat corect, te rog încearcă din nou.",
+    "Subscribe": "Abonează-te",
+    "To complete signup, click the confirmation link in your inbox. If it doesn't arrive within 3 minutes, check your spam folder!": "Pentru a completa înregistrarea, fă clic pe linkul de confirmare din inbox-ul tău. Dacă nu sosește în termen de 3 minute, verifică dosarul de spam!",
+    "Your email address": "Adresa ta de email"
 }
diff --git a/ghost/i18n/locales/ru/comments.json b/ghost/i18n/locales/ru/comments.json
index bcb0715d9a1..51b289bdfea 100644
--- a/ghost/i18n/locales/ru/comments.json
+++ b/ghost/i18n/locales/ru/comments.json
@@ -1,73 +1,73 @@
 {
-    "{{amount}} characters left": "",
-    "{{amount}} comments": "",
-    "{{amount}} days ago": "",
-    "{{amount}} hours ago": "",
-    "{{amount}} minutes ago": "",
-    "{{amount}} months ago": "",
-    "{{amount}} more": "",
-    "{{amount}} seconds ago": "",
-    "{{amount}} weeks ago": "",
-    "{{amount}} years ago": "",
-    "1 comment": "",
-    "Add comment": "",
-    "Add context to your comment, share your name and expertise to foster a healthy discussion.": "",
-    "Add reply": "",
-    "Already a member?": "",
-    "Anonymous": "",
+    "{{amount}} characters left": "{{amount}} символов осталось",
+    "{{amount}} comments": "{{amount}} комментариев",
+    "{{amount}} days ago": "{{amount}} дней назад",
+    "{{amount}} hours ago": "{{amount}} часов назад",
+    "{{amount}} minutes ago": "{{amount}} минут назад",
+    "{{amount}} months ago": "{{amount}} месяцев назад",
+    "{{amount}} more": "{{amount}} более",
+    "{{amount}} seconds ago": "{{amount}} секунд назад",
+    "{{amount}} weeks ago": "{{amount}} недели назад",
+    "{{amount}} years ago": "{{amount}} лет назад",
+    "1 comment": "1 комментарий",
+    "Add comment": "Добавить комментарий",
+    "Add context to your comment, share your name and expertise to foster a healthy discussion.": "Добавьте подробности о себе, чтобы обсуждение стало более интерессным",
+    "Add reply": "Добавить ответ",
+    "Already a member?": "Уже присоединился?",
+    "Anonymous": "Анонимный",
     "Become a member of {{publication}} to start commenting.": "",
     "Become a paid member of {{publication}} to start commenting.": "",
-    "Cancel": "",
-    "Comment": "",
-    "Complete your profile": "",
-    "Delete": "",
-    "Deleted member": "",
-    "Discussion": "",
-    "Edit": "",
-    "Edit this comment": "",
-    "Edited": "",
-    "Enter your name": "",
+    "Cancel": "Отмена",
+    "Comment": "Комментарий",
+    "Complete your profile": "Заполните свой профиль",
+    "Delete": "Удалить",
+    "Deleted member": "Удаленный участник",
+    "Discussion": "Обсуждение",
+    "Edit": "Редактировать",
+    "Edit this comment": "Редактировать этот комментарий",
+    "Edited": "Отредактированно",
+    "Enter your name": "Введите ваше имя",
     "Expertise": "",
     "Founder @ Acme Inc": "",
     "Full-time parent": "",
     "Head of Marketing at Acme, Inc": "",
-    "Hide": "",
-    "Hide comment": "",
-    "Jamie Larson": "",
-    "Join the discussion": "",
-    "Just now": "",
+    "Hide": "Скрыть",
+    "Hide comment": "Скрыть комментарий",
+    "Jamie Larson": "Вася Пупкин",
+    "Join the discussion": "Присоединиться к обсуждению",
+    "Just now": "Сейчас",
     "Local resident": "",
-    "Member discussion": "",
-    "Name": "",
+    "Member discussion": "Обсуждение участников",
+    "Name": "Имя",
     "Neurosurgeon": "",
-    "One day ago": "",
-    "One hour ago": "",
-    "One minute ago": "",
-    "One month ago": "",
-    "One week ago": "",
-    "One year ago": "",
-    "Reply": "",
-    "Reply to comment": "",
-    "Report": "",
-    "Report comment": "",
-    "Report this comment": "",
-    "Report this comment?": "",
-    "Save": "",
-    "Sending": "",
-    "Sent": "",
-    "Show": "",
-    "Show {{amount}} more replies": "",
-    "Show {{amount}} previous comments": "",
-    "Show 1 more reply": "",
-    "Show 1 previous comment": "",
-    "Show comment": "",
-    "Sign in": "",
-    "Sign up now": "",
-    "Start the conversation": "",
-    "This comment has been hidden.": "",
-    "This comment has been removed.": "",
-    "Upgrade now": "",
-    "Yesterday": "",
-    "You want to report this comment?": "",
-    "Your request will be sent to the owner of this site.": ""
+    "One day ago": "День назад",
+    "One hour ago": "Час назад",
+    "One minute ago": "Минута назад",
+    "One month ago": "Месяц назад",
+    "One week ago": "Неделю назад",
+    "One year ago": "Год назад",
+    "Reply": "Ответить",
+    "Reply to comment": "Ответить на комментарий",
+    "Report": "Пожаловаться",
+    "Report comment": "Пожаловаться на комментарий",
+    "Report this comment": "Пожаловаться на этот комментарий",
+    "Report this comment?": "Пожаловаться на этот комментарий?",
+    "Save": "Сохранить",
+    "Sending": "Отправка",
+    "Sent": "Отправлено",
+    "Show": "Показать",
+    "Show {{amount}} more replies": "Показать {{amount}} ответов",
+    "Show {{amount}} previous comments": "Показать еще {{amount}} комментариев",
+    "Show 1 more reply": "Показать ответ",
+    "Show 1 previous comment": "Показать предыдущий комментарий",
+    "Show comment": "Показать комментарий",
+    "Sign in": "Войти",
+    "Sign up now": "Войти сейчас",
+    "Start the conversation": "Начать обсуждение",
+    "This comment has been hidden.": "Этот комментарий скрыт",
+    "This comment has been removed.": "Комментарий был удален",
+    "Upgrade now": "Обновить ",
+    "Yesterday": "Вчера",
+    "You want to report this comment?": "Вы хотите пожаловаться на этот комментарий?",
+    "Your request will be sent to the owner of this site.": "Ваш запрос будет отправлен владельцу сайта"
 }
diff --git a/ghost/i18n/locales/ru/signup-form.json b/ghost/i18n/locales/ru/signup-form.json
index cc957d9d0d1..c26a5f04274 100644
--- a/ghost/i18n/locales/ru/signup-form.json
+++ b/ghost/i18n/locales/ru/signup-form.json
@@ -1,9 +1,9 @@
 {
-    "Email sent": "",
-    "Now check your email!": "",
-    "Please enter a valid email address": "",
-    "Something went wrong, please try again.": "",
+    "Email sent": "Письмо отправлено",
+    "Now check your email!": "Теперь проверьте свою электронную почту!",
+    "Please enter a valid email address": "Пожалуйста, введите действительный адрес электронной почты",
+    "Something went wrong, please try again.": "Что-то пошло не так. Пожалуйста, попробуйте еще раз.",
     "Subscribe": "",
-    "To complete signup, click the confirmation link in your inbox. If it doesn't arrive within 3 minutes, check your spam folder!": "",
-    "Your email address": ""
+    "To complete signup, click the confirmation link in your inbox. If it doesn't arrive within 3 minutes, check your spam folder!": "Чтобы завершить регистрацию, нажмите на ссылку подтверждения в письме. Если письмо не пришло в течение 3 минут, проверьте папку «Спам»!",
+    "Your email address": "Ваша электронная почта"
 }
diff --git a/ghost/i18n/locales/sk/comments.json b/ghost/i18n/locales/sk/comments.json
new file mode 100644
index 00000000000..d7c87122969
--- /dev/null
+++ b/ghost/i18n/locales/sk/comments.json
@@ -0,0 +1,73 @@
+{
+    "{{amount}} characters left": "Zostáva {{amount}} znakov",
+    "{{amount}} comments": "{{amount}} komentárov",
+    "{{amount}} days ago": "Pred {{amount}} dňami",
+    "{{amount}} hours ago": "Pred {{amount}} hodinami",
+    "{{amount}} minutes ago": "Pred {{amount}} minútami",
+    "{{amount}} months ago": "Pred {{amount}} mesiacmi",
+    "{{amount}} more": "",
+    "{{amount}} seconds ago": "Pred {{amount}} sekundami",
+    "{{amount}} weeks ago": "Pred {{amount}} týždňami",
+    "{{amount}} years ago": "Pred {{amount}} rokmi",
+    "1 comment": "1 komentár",
+    "Add comment": "Pridať komentár",
+    "Add context to your comment, share your name and expertise to foster a healthy discussion.": "Pridajte kontext do váško komentára, zdielajte vaše meno, a odbornosť pre podporu zdravej diskusie.",
+    "Add reply": "Pridať odpoveď",
+    "Already a member?": "Už ste členom?",
+    "Anonymous": "Anonymne",
+    "Become a member of {{publication}} to start commenting.": "Staňte sa členom {{publication}}, aby ste mohli začať komentovať",
+    "Become a paid member of {{publication}} to start commenting.": "Staňte sa plateným členom {{publication}}, aby ste mohli začať komentovať",
+    "Cancel": "Zrušiť",
+    "Comment": "Komentár",
+    "Complete your profile": "Dokončite váš profil",
+    "Delete": "Vymazať",
+    "Deleted member": "Vymazaný člen",
+    "Discussion": "Diskusia",
+    "Edit": "Upraviť",
+    "Edit this comment": "Upraviť tento komentár",
+    "Edited": "Upravený",
+    "Enter your name": "Zadajte vaše meno",
+    "Expertise": "Odbornosť",
+    "Founder @ Acme Inc": "Zakladateľ @ Acme Inc",
+    "Full-time parent": "Rodič na plný úväzok",
+    "Head of Marketing at Acme, Inc": "Vedúci marketingu v spoločnosti Acme, Inc",
+    "Hide": "Skryť",
+    "Hide comment": "Skryť komentár",
+    "Jamie Larson": "",
+    "Join the discussion": "Zapojiť sa do diskusie",
+    "Just now": "Teraz",
+    "Local resident": "Miestny obyvateľ",
+    "Member discussion": "",
+    "Name": "Meno",
+    "Neurosurgeon": "Neurogirurg",
+    "One day ago": "Včera",
+    "One hour ago": "Pred hodinou",
+    "One minute ago": "Pred minútov",
+    "One month ago": "Pred mesiacom",
+    "One week ago": "Pred týždňom",
+    "One year ago": "Pred rokom",
+    "Reply": "Odpovedať",
+    "Reply to comment": "Odpovedať na komentár",
+    "Report": "Nahlásiť",
+    "Report comment": "Nahlásiť komentár",
+    "Report this comment": "Nahlásiť tento komentár",
+    "Report this comment?": "Nahlásiť tento komentár?",
+    "Save": "Uložiť",
+    "Sending": "Odosielanie",
+    "Sent": "Odoslané",
+    "Show": "Zobraziť",
+    "Show {{amount}} more replies": "Zobraziť {{amount}} ďalších odpoveďí",
+    "Show {{amount}} previous comments": "Zobraziť {{amount}} predchádzajúcich komentárov",
+    "Show 1 more reply": "Zobraziť 1 ďalšiu odpoveď",
+    "Show 1 previous comment": "Zobraziť 1 predchádzajúci komentár",
+    "Show comment": "Zobraziť komentár",
+    "Sign in": "Prihlásiť",
+    "Sign up now": "Registrovať sa",
+    "Start the conversation": "Začať konverzáciu",
+    "This comment has been hidden.": "Tento komentár bol skrytý.",
+    "This comment has been removed.": "Tento komentár bol vymazaný.",
+    "Upgrade now": "Upgradovať teraz",
+    "Yesterday": "Včera",
+    "You want to report this comment?": "Chcete nahlásiť tento komentár?",
+    "Your request will be sent to the owner of this site.": "Vaša požiadavka bola odoslaná vlastníkovi stránky."
+}
diff --git a/ghost/i18n/locales/sk/ghost.json b/ghost/i18n/locales/sk/ghost.json
new file mode 100644
index 00000000000..8286fdf7782
--- /dev/null
+++ b/ghost/i18n/locales/sk/ghost.json
@@ -0,0 +1,34 @@
+{
+    "All the best!": "Všetko najlepšie!",
+    "Complete signup for {{siteTitle}}!": "Dokončite registráciu pre {{siteTitle}}!",
+    "Complete your sign up to {{siteTitle}}!": "Dokončite registráciu pre {{siteTitle}}!",
+    "Confirm email address": "Potvrdiť e-mailovú adresu",
+    "Confirm signup": "Potvrdiť registráciu",
+    "Confirm your email address": "Potvrdiť e-mailovú adresu",
+    "Confirm your email update for {{siteTitle}}!": "Potvrdiť zmenu e-mailu pre {{siteTitle}}!",
+    "Confirm your subscription to {{siteTitle}}": "Potvrdiť odber z {{siteTitle}}",
+    "For your security, the link will expire in 24 hours time.": "Z bezpečnostných dôvodov platnosť odkazu vyprší o 24 hodín.",
+    "Hey there,": "Ahoj,",
+    "Hey there!": "Ahoj!",
+    "If you did not make this request, you can safely ignore this email.": "Ak ste túto žiadosť neodoslali, môžte tento e-mail pokojne ignorovať.",
+    "If you did not make this request, you can simply delete this message.": "Ak ste túto žiadosť neodoslali, môžte túto správu pokojne vymazať.",
+    "Please confirm your email address with this link:": "Prosím potvrďte svoju e-mailovú adresu kliknutím na nasledujúci odkaz",
+    "Secure sign in link for {{siteTitle}}": "Bezpečný prihlasovací odkaz pre {{siteTitle}}",
+    "See you soon!": "Dovidenia!",
+    "Sent to {{email}}": "Odoslané na {{email}}",
+    "Sign in": "Prihlásiť",
+    "Sign in to {{siteTitle}}": "Prihlásiť sa na {{siteTitle}}",
+    "Tap the link below to complete the signup process for {{siteTitle}}, and be automatically signed in:": "Kliknite na nasledujúci odkaz pre dokončenie registrácie na {{siteTitle}} a automatické prihlásenie:",
+    "Thank you for signing up to {{siteTitle}}!": "Ďakujeme za registráciu na {{siteTitle}}!",
+    "Thank you for subscribing to {{siteTitle}}!": "Ďakujeme za odber z {{siteTitle}}!",
+    "Thank you for subscribing to {{siteTitle}}.": "Ďakujeme za odber z {{siteTitle}}.",
+    "Thank you for subscribing to {{siteTitle}}. Tap the link below to be automatically signed in:": "Ďakujeme za odber z {{siteTitle}}. Kliknite na nasledujúci odkaz pre automatické prihlásenie:",
+    "This email address will not be used.": "Táto e-mailová adresa nebude použitá.",
+    "Welcome back to {{siteTitle}}!": "Vitajte späť na {{siteTitle}}!",
+    "Welcome back! Use this link to securely sign in to your {{siteTitle}} account:": "Vitajte späť! Použite tento odkaz na bezpečné prihlásenie do účtu {{siteTitle}}:",
+    "You can also copy & paste this URL into your browser:": "Môžte taktiež skopírovať túto URL do vášho prehliadača:",
+    "You will not be signed up, and no account will be created for you.": "Nebudete registrovaný a nebude vytvorený žiadny účet.",
+    "You will not be subscribed.": "Nebudete prihlásený k odberu.",
+    "You're one tap away from subscribing to {{siteTitle}} — please confirm your email address with this link:": "Ste jedno kliknutie od odberu z {{siteTitle}} — prosím potvrďte svoju e-mailovú adresu pomocou nasledujúceho odkazu:",
+    "You're one tap away from subscribing to {{siteTitle}}!": "Ste jedno kliknutie od odberu z {{siteTitle}}!"
+}
diff --git a/ghost/i18n/locales/sk/portal.json b/ghost/i18n/locales/sk/portal.json
new file mode 100644
index 00000000000..87ee3e337df
--- /dev/null
+++ b/ghost/i18n/locales/sk/portal.json
@@ -0,0 +1,158 @@
+{
+    "{{amount}} days free": "{{amount}} dní zdarma",
+    "{{amount}} off": "{{amount}} zľava",
+    "{{amount}} off for first {{number}} months.": "Zľava {{amount}} pre prvé {{number}} mesiace.",
+    "{{amount}} off for first {{period}}.": "Zľava {{amount}} pre prvé {{period}}.",
+    "{{amount}} off forever.": "Zľava {{amount}} navždy",
+    "{{discount}}% discount": "Zľava {{discount}}%",
+    "{{memberEmail}} will no longer receive {{newsletterName}} newsletter.": "{{memberEmail}} úž nebude dostávať {{newsletterName}} newsletter.",
+    "{{memberEmail}} will no longer receive emails when someone replies to your comments.": "{{memberEmail}} úž nebude dostávať e-maily, keď niekto odpovie na vaše komentáre.",
+    "{{memberEmail}} will no longer receive this newsletter.": "{{memberEmail}} úž nebude dostávať tento newsletter.",
+    "{{trialDays}} days free": "{{trialDays}} dní zdarma",
+    "A login link has been sent to your inbox. If it doesn't arrive in 3 minutes, be sure to check your spam folder.": "Prihlasovací odkaz bol odoslaný na váš e-mail. Ak nedorazi do 3 minút, skontrolujte priečinok so spamom",
+    "Account": "Ůčet",
+    "Account settings": "Nastavenia účtu",
+    "After a free trial ends, you will be charged the regular price for the tier you've chosen. You can always cancel before then.": "Po uplynutí skúšobného obdobia vám bute účtovaná bežná cena pre vybrunú úrovenň. Vždy to môžte pred tým zrušiť",
+    "Already a member?": "Ste úž členom?",
+    "An unexpected error occured. Please try again or <a>contact support</a> if the error persists.": "Nastala neočakávaná chyba. Prosím skúste neskôr alebo <a>kontaktujte podporu</a> ak problém pretrváva.",
+    "Back": "Späť",
+    "Back to Log in": "Späť na prihlásenie",
+    "Billing info": "Fakturačné údaje",
+    "Black Friday": "",
+    "Cancel anytime.": "Zrušiť kedykoľvek",
+    "Cancel subscription": "Zrušiť odber",
+    "Cancellation reason": "Dôvod zrušenia",
+    "Change": "Zmena",
+    "Check spam & promotions folders": "Skontrolujte spam",
+    "Check with your mail provider": "Overte si to s vašim e-mailovým poskytovateľom.",
+    "Choose": "Vybrať",
+    "Choose a different plan": "Vybrať iný plán",
+    "Choose your newsletters": "Vyberte si newsletter",
+    "Click here to retry": "Kliknite sem pre obnovenie",
+    "Close": "Zatvoriť",
+    "Comments": "Komentáre",
+    "Complimentary": "Bezplatné",
+    "Confirm": "Potvrdiť",
+    "Confirm cancellation": "Potvrdiť zrušenie",
+    "Confirm subscription": "Potvrdiť odber",
+    "Contact support": "Kontaktovať podporu",
+    "Continue": "Pokračovať",
+    "Continue subscription": "Pokračovať s odberom",
+    "Could not sign in. Login link expired.": "Prihlásenie sa nepodarilo. Odkaz na prihlásenie vyexpiroval.",
+    "Could not update email! Invalid link.": "Zmena e-mailu sa nepodarila. Neplatný odkaz.",
+    "Create a new contact": "Vytvoriť nový kontakt",
+    "Current plan": "Aktuálny plán",
+    "Delete account": "Vymazať účet",
+    "Didn't mean to do this? Manage your preferences <button>here</button>.": "Nechceli ste to urobiť? Spravujte svjoe nastavenia <button>tu</button>.",
+    "Don't have an account?": "Ešte nemáte účet?",
+    "Edit": "Upraviť",
+    "Email": "",
+    "Email newsletter": "",
+    "Email preference updated.": "E-mailové nastavnia zmenené.",
+    "Email preferences": "E-mailové nastavnia",
+    "Emails": "E-maily",
+    "Emails disabled": "E-maily vypnuté",
+    "Ends {{offerEndDate}}": "Vyprší {{offerEndDate}}",
+    "Error": "Chyba",
+    "Expires {{expiryDate}}": "Expiruje {{expiryDate}}",
+    "Forever": "Navždy",
+    "Free Trial – Ends {{trialEnd}}": "Skúšobná verzia – Vyprší {{trialEnd}}",
+    "Get help": "Získať pomoc",
+    "Get in touch for help": "Obrátiť sa na pomoc",
+    "Get notified when someone replies to your comment": "Dostávať upozornenie ak niekto odpíše na komentár",
+    "Give feedback on this post": "Dať spätnú väzbu na tento príspevok",
+    "Help! I'm not receiving emails": "Pomcc! Nedostávam e-maily",
+    "Here are a few other sites you may enjoy.": "Tu je niekoľko ďalších stránok, ktoré sa vám môžu páčiť.",
+    "If a newsletter is flagged as spam, emails are automatically disabled for that address to make sure you no longer receive any unwanted messages.": "",
+    "If the spam complaint was accidental, or you would like to begin receiving emails again, you can resubscribe to emails by clicking the button on the previous screen.": "",
+    "If you cancel your subscription now, you will continue to have access until {{periodEnd}}.": "Ak teraz zrušíte svoje predplatné, budete mať prístup až do {{periodEnd}}.",
+    "If you have a corporate or government email account, reach out to your IT department and ask them to allow emails to be received from {{senderEmail}}": "",
+    "If you would like to start receiving emails again, the best next steps are to check your email address on file for any issues and then click resubscribe on the previous screen.": "",
+    "If you're not receiving the email newsletter you've subscribed to, here are few things to check.": "",
+    "If you've completed all these checks and you're still not receiving emails, you can reach out to get support by contacting {{supportAddress}}.": "",
+    "In the event a permanent failure is received when attempting to send a newsletter, emails will be disabled on the account.": "",
+    "In your email client add {{senderEmail}} to your contacts list. This signals to your mail provider that emails sent from this address should be trusted.": "",
+    "Less like this": "Menej podobných",
+    "Make sure emails aren't accidentally ending up in the Spam or Promotions folders of your inbox. If they are, click on \"Mark as not spam\" and/or \"Move to inbox\".": "",
+    "Manage": "Spravovať",
+    "Maybe later": "Možno neskôr",
+    "Memberships unavailable, contact the owner for access.": "Členstvá nie sú k dispozícii, pre prístup kontaktujte vlastníka stránky.",
+    "Monthly": "Mesačne",
+    "More like this": "Viac podobných",
+    "Name": "Meno",
+    "Need more help? Contact support": "Potrebueje viac pomôcť? Kontaktujte podporu",
+    "Newsletters can be disabled on your account for two reasons: A previous email was marked as spam, or attempting to send an email resulted in a permanent failure (bounce).": "",
+    "Not receiving emails?": "Nedostávate e-maily?",
+    "Now check your email!": "Skontrolujte svoju m-mailovú schránku!",
+    "Once resubscribed, if you still don't see emails in your inbox, check your spam folder. Some inbox providers keep a record of previous spam complaints and will continue to flag emails. If this happens, mark the latest newsletter as 'Not spam' to move it back to your primary inbox.": "",
+    "Permanent failure (bounce)": "Trvalá chyba (bounce)",
+    "Plan": "Plán",
+    "Plan checkout was cancelled.": "Platba za plán bola zrušená.",
+    "Plan upgrade was cancelled.": "Upgrade plánu bol zrušený",
+    "Please contact {{supportAddress}} to adjust your complimentary subscription.": "Prosím kontaktujte {{supportAddress}} pre upravenie vášho bezplatného predplatného.",
+    "Please fill in required fields": "Prosím vyplňte požadované polia.",
+    "Price": "Cena",
+    "Re-enable emails": "Obnoviť e-maily",
+    "Recommendations": "",
+    "Renews at {{price}}.": "Obnoviť za {{price}}.",
+    "Retry": "Skúsiť znovu",
+    "Save": "Uložiť",
+    "Send an email and say hi!": "Odoslať e-mail a pozdraviť!",
+    "Send an email to {{senderEmail}} and say hello. This can also help signal to your mail provider that emails to-and-from this address should be trusted.": "",
+    "Sending login link...": "Odosielanie prihlasovacieho odkazu...",
+    "Sending...": "Odosielanie...",
+    "Show all": "Zobraziť všetko",
+    "Sign in": "Prihlásiť",
+    "Sign out": "Odhlásiť",
+    "Sign up": "Registrovať",
+    "Signup error: Invalid link": "Chyba registrácie: Neplatný odkaz",
+    "Sorry, that didn’t work.": "Prepáčte za výpadok.",
+    "Spam complaints": "Spamové sťažnosti",
+    "Start {{amount}}-day free trial": "Začať {{amount}}-dňovú skúšobnú dobu",
+    "Starting {{startDate}}": "Začína {{startDate}}",
+    "Starting today": "Začina dnes",
+    "Submit feedback": "Odoslať spätnú väzbu",
+    "Subscribe": "Odoberať",
+    "Subscribed": "Prihásený k odberu",
+    "Success": "Blahoželáme",
+    "Success! Check your email for magic link to sign-in.": "Blahoželáme! Skontrolujte vašu e-mailovú schránku kde nájdete odkaz na prihlásenie.",
+    "Success! Your account is fully activated, you now have access to all content.": "Blahoželáme! Váš účet je aktivovaný. Máte prístup ku všetkému obsahu.",
+    "Success! Your email is updated.": "Blahoželáme! Váš e-mail bol zmenený.",
+    "Successfully unsubscribed": "Úspešne odhlásený z odberu",
+    "Thank you for subscribing. Before you start reading, below are a few other sites you may enjoy.": "",
+    "Thanks for the feedback!": "Ďakujeme za spätnú väzbu!",
+    "That didn't go to plan": "Niečo sa nepodarilo",
+    "The email address we have for you is {{memberEmail}} — if that's not correct, you can update it in your <button>account settings area</button>.": "",
+    "There was a problem submitting your feedback. Please try again a little later.": "Nepodarilo sa odoslať váš feedback. Prosím skúste to neskôr.",
+    "This site is invite-only, contact the owner for access.": "Táto stránka je iba pre pozvaných úžívateľov, kontaktujte vlastníka stránky.",
+    "To complete signup, click the confirmation link in your inbox. If it doesn't arrive within 3 minutes, check your spam folder!": "",
+    "Try free for {{amount}} days, then {{originalPrice}}.": "Vyskúšajte zadarmo na {{amount}} dní, potom {{originalPrice}}",
+    "Unlock access to all newsletters by becoming a paid subscriber.": "",
+    "Unsubscribe from all emails": "Odhlásený z odberu všetkých email-ov",
+    "Unsubscribed": "Odhlásený z odberu",
+    "Unsubscribing from emails will not cancel your paid subscription to {{title}}": "Odhlásením z odberu email-ov sa nezruší predplatné k {{title}}",
+    "Update": "Upraviť",
+    "Update your preferences": "Upraviť nastavenia",
+    "Verification link sent, check your inbox": "",
+    "Verify your email address is correct": "Overiť, že Vaša email-ová adresa je správna",
+    "View plans": "Prezriet plány",
+    "We couldn't unsubscribe you as the email address was not found. Please contact the site owner.": "Nepodarilo sa nám vymazať z odberu váš email, email nenájdený. Prosím kontaktujte vlastníka stránky.",
+    "Welcome back, {{name}}!": "Vitaj späť, {{name}}!",
+    "Welcome back!": "Vitajte späť1",
+    "Welcome to {{siteTitle}}": "",
+    "When an inbox fails to accept an email it is commonly called a bounce. In many cases, this can be temporary. However, in some cases, a bounced email can be returned as a permanent failure when an email address is invalid or non-existent.": "",
+    "Why has my email been disabled?": "Prečo bol môj email deaktivovaný?",
+    "Yearly": "Ročne",
+    "You currently have a free membership, upgrade to a paid subscription for full access.": "Aktuálne máte bezplatné členstvo, upgradnite na platené predplatné, aby ste získali plný prístup.",
+    "You have been successfully resubscribed": "Vaše predplatné bolo úspešne obnovené",
+    "You're currently not receiving emails": "Aktuálne nepríjimate emaily",
+    "You're not receiving emails": "Nedostávate email-y",
+    "You're not receiving emails because you either marked a recent message as spam, or because messages could not be delivered to your provided email address.": "Nepríjimate email-y lebo váša posledná správa bola označená ako spam, alebo správy nemohli byť doručené na vašu email-ovú adresu.",
+    "You've successfully signed in.": "Úspešne ste sa prihlásili",
+    "You've successfully subscribed to": "",
+    "Your account": "Váš účet",
+    "Your input helps shape what gets published.": "Vaše pripomienky pomáhajú spoluvytvárať obsah webu.",
+    "Your subscription will expire on {{expiryDate}}": "Váše predplatné expiruje {{expiryDate}}",
+    "Your subscription will renew on {{renewalDate}}": "Váše predplatné bude obnovené {{renewalDate}}",
+    "Your subscription will start on {{subscriptionStart}}": "Váše predplatné začína {{subscriptionStart}}"
+}
diff --git a/ghost/i18n/locales/sk/signup-form.json b/ghost/i18n/locales/sk/signup-form.json
new file mode 100644
index 00000000000..a1299c3f153
--- /dev/null
+++ b/ghost/i18n/locales/sk/signup-form.json
@@ -0,0 +1,9 @@
+{
+    "Email sent": "Email odoslaný",
+    "Now check your email!": "Teraz skontrolujte váš email",
+    "Please enter a valid email address": "Prosím zadajte správnu email-ovú adresu",
+    "Something went wrong, please try again.": "Niečo sa nepodarilo, skúste neskôr.",
+    "Subscribe": "Prihlásiť k odberu",
+    "To complete signup, click the confirmation link in your inbox. If it doesn't arrive within 3 minutes, check your spam folder!": "Pre dokončenie registrácie, kliknite na konfirmačný odkaz v emailovej schránke. Ak nepríde do 3 minút skontrolujte spam priečinok!",
+    "Your email address": "Vaša email-ová adresa"
+}
diff --git a/ghost/i18n/locales/tr/comments.json b/ghost/i18n/locales/tr/comments.json
index f38961babc6..8f1aca0a373 100644
--- a/ghost/i18n/locales/tr/comments.json
+++ b/ghost/i18n/locales/tr/comments.json
@@ -63,7 +63,7 @@
     "Show comment": "Yorumu göster",
     "Sign in": "Giriş yap",
     "Sign up now": "Şimdi kayıt ol",
-    "Start the conversation": "Yorum yapmaya başla",
+    "Start the conversation": "Bu konu hakkında düşüncelerini paylaşmak için yorum yap",
     "This comment has been hidden.": "Bu yorum gizlendi.",
     "This comment has been removed.": "Bu yorum kaldırıldı.",
     "Upgrade now": "Şimdi yükselt",
diff --git a/ghost/i18n/locales/vi/comments.json b/ghost/i18n/locales/vi/comments.json
index a1ba3b69d6c..d73a3c34f5c 100644
--- a/ghost/i18n/locales/vi/comments.json
+++ b/ghost/i18n/locales/vi/comments.json
@@ -5,7 +5,7 @@
     "{{amount}} hours ago": "{{amount}} giờ trước",
     "{{amount}} minutes ago": "{{amount}} phút trước",
     "{{amount}} months ago": "{{amount}} tháng trước",
-    "{{amount}} more": "",
+    "{{amount}} more": "{{amount}} nữa",
     "{{amount}} seconds ago": "{{amount}} giây trước",
     "{{amount}} weeks ago": "{{amount}} tuần trước",
     "{{amount}} years ago": "{{amount}} năm trước",
diff --git a/ghost/i18n/locales/vi/portal.json b/ghost/i18n/locales/vi/portal.json
index 28183f78492..b865d5e650f 100644
--- a/ghost/i18n/locales/vi/portal.json
+++ b/ghost/i18n/locales/vi/portal.json
@@ -62,7 +62,7 @@
     "Get notified when someone replies to your comment": "Nhận thông báo khi có ai đó trả lời bình luận",
     "Give feedback on this post": "Phản hồi bài viết này",
     "Help! I'm not receiving emails": "Giúp tôi! Tôi không nhận được email",
-    "Here are a few other sites you may enjoy.": "",
+    "Here are a few other sites you may enjoy.": "Đây là vài trang khác mà bạn có thể thích.",
     "If a newsletter is flagged as spam, emails are automatically disabled for that address to make sure you no longer receive any unwanted messages.": "Nếu một bản tin bị gắn nhãn thư rác, email sẽ tự động bị vô hiệu hóa đối với địa chỉ đó để đảm bảo bạn không còn nhận được bất kỳ email không mong muốn nào nữa.",
     "If the spam complaint was accidental, or you would like to begin receiving emails again, you can resubscribe to emails by clicking the button on the previous screen.": "Nếu khiếu nại về thư rác là vô tình hoặc bạn muốn bắt đầu nhận lại email, bạn có thể đăng ký lại email bằng cách nhấp vào nút trên màn hình trước đó.",
     "If you cancel your subscription now, you will continue to have access until {{periodEnd}}.": "Nếu bạn hủy đăng ký ngay bây giờ, bạn sẽ tiếp tục có quyền truy cập cho đến {{periodEnd}}.",
@@ -76,7 +76,7 @@
     "Make sure emails aren't accidentally ending up in the Spam or Promotions folders of your inbox. If they are, click on \"Mark as not spam\" and/or \"Move to inbox\".": "Hãy chắc rằng email không đang trong hộp thư Spam hoặc Quảng cáo. Nếu đang vậy, chọn \"Đánh dấu không phải spam\" hoặc \"Chuyển tới Hộp thư đến\".",
     "Manage": "Quản lý",
     "Maybe later": "",
-    "Memberships unavailable, contact the owner for access.": "",
+    "Memberships unavailable, contact the owner for access.": "Chưa phải là thành viên, liên hệ với chủ sở hữu để truy cập.",
     "Monthly": "Hàng tháng",
     "More like this": "Thích bài viết như này",
     "Name": "Tên",
@@ -89,19 +89,19 @@
     "Plan": "Gói",
     "Plan checkout was cancelled.": "Đã hủy thanh toán.",
     "Plan upgrade was cancelled.": "Đã hủy nâng cấp gói.",
-    "Please contact {{supportAddress}} to adjust your complimentary subscription.": "",
+    "Please contact {{supportAddress}} to adjust your complimentary subscription.": "Vui lòng liên hệ {{supportAddress}} để điều chỉnh gói đăng ký.",
     "Please fill in required fields": "Vui lòng điền các mục bắt buộc",
     "Price": "Giá",
     "Re-enable emails": "Kích hoạt lại email",
-    "Recommendations": "",
-    "Renews at {{price}}.": "Gia hạn giá {{price}}.",
+    "Recommendations": "Đề xuất",
+    "Renews at {{price}}.": "Giá gia hạn {{price}}.",
     "Retry": "Thử lại",
     "Save": "Lưu",
     "Send an email and say hi!": "Gửi một email và nói xin chào!",
     "Send an email to {{senderEmail}} and say hello. This can also help signal to your mail provider that emails to-and-from this address should be trusted.": "Gửi email tới {{senderEmail}} và gửi lời chào. Điều này cũng có thể giúp báo hiệu cho nhà cung cấp dịch vụ email của bạn rằng các email đến và đi từ địa chỉ này là đáng tin cậy.",
     "Sending login link...": "Đang gửi liên kết đăng nhập...",
     "Sending...": "Đang gửi...",
-    "Show all": "",
+    "Show all": "Hiện toàn bộ",
     "Sign in": "Đăng nhập",
     "Sign out": "Đăng xuất",
     "Sign up": "Đăng ký",
@@ -133,13 +133,13 @@
     "Unsubscribing from emails will not cancel your paid subscription to {{title}}": "Việc hủy theo dõi qua email sẽ không hủy gói đăng ký trả phí của bạn đối với {{title}}",
     "Update": "Cập nhật",
     "Update your preferences": "Cập nhật thiết lập",
-    "Verification link sent, check your inbox": "",
+    "Verification link sent, check your inbox": "Đã gửi liên kết xác minh, hãy kiểm tra hộp thư đến",
     "Verify your email address is correct": "Xác minh địa chỉ mail của bạn là đúng",
     "View plans": "Xem các gói",
     "We couldn't unsubscribe you as the email address was not found. Please contact the site owner.": "Chúng tôi không thể hủy theo dõi vì không tìm thấy địa chỉ email. Vui lòng liên hệ với chủ sở hữu trang web.",
     "Welcome back, {{name}}!": "Chào mừng trở lại, {{name}}!",
     "Welcome back!": "Chào mừng trở lại!",
-    "Welcome to {{siteTitle}}": "",
+    "Welcome to {{siteTitle}}": "Chào mừng tham gia {{siteTitle}}",
     "When an inbox fails to accept an email it is commonly called a bounce. In many cases, this can be temporary. However, in some cases, a bounced email can be returned as a permanent failure when an email address is invalid or non-existent.": "Khi hộp thư đến không nhận được email, nó thường được gọi là email bị trả lại. Điều này có thể là tạm thời. Tuy nhiên, trong một số trường hợp, email bị trả lại có thể là lỗi vĩnh viễn nếu địa chỉ email không hợp lệ hoặc không tồn tại.",
     "Why has my email been disabled?": "Tại sao email của tôi bị vô hiệu hóa?",
     "Yearly": "Hàng năm",
@@ -149,7 +149,7 @@
     "You're not receiving emails": "Bạn không nhận được email",
     "You're not receiving emails because you either marked a recent message as spam, or because messages could not be delivered to your provided email address.": "Bạn không nhận được email vì bạn đã đánh dấu một email gần đây là thư rác, hoặc vì không thể gửi đến địa chỉ email bạn đã cung cấp.",
     "You've successfully signed in.": "Bạn đã đăng nhập.",
-    "You've successfully subscribed to": "",
+    "You've successfully subscribed to": "Bạn đã hoàn tất đăng ký",
     "Your account": "Tài khoản của bạn",
     "Your input helps shape what gets published.": "Thông tin của bạn giúp định hình nội dung được xuất bản.",
     "Your subscription will expire on {{expiryDate}}": "Gói của bạn sẽ hết hạn vào {{expiryDate}}",
diff --git a/ghost/i18n/locales/zh-Hant/comments.json b/ghost/i18n/locales/zh-Hant/comments.json
index bcb0715d9a1..74a6ec0f9f1 100644
--- a/ghost/i18n/locales/zh-Hant/comments.json
+++ b/ghost/i18n/locales/zh-Hant/comments.json
@@ -1,73 +1,73 @@
 {
-    "{{amount}} characters left": "",
-    "{{amount}} comments": "",
-    "{{amount}} days ago": "",
-    "{{amount}} hours ago": "",
-    "{{amount}} minutes ago": "",
-    "{{amount}} months ago": "",
-    "{{amount}} more": "",
-    "{{amount}} seconds ago": "",
-    "{{amount}} weeks ago": "",
-    "{{amount}} years ago": "",
-    "1 comment": "",
-    "Add comment": "",
-    "Add context to your comment, share your name and expertise to foster a healthy discussion.": "",
-    "Add reply": "",
-    "Already a member?": "",
-    "Anonymous": "",
-    "Become a member of {{publication}} to start commenting.": "",
-    "Become a paid member of {{publication}} to start commenting.": "",
-    "Cancel": "",
-    "Comment": "",
-    "Complete your profile": "",
-    "Delete": "",
-    "Deleted member": "",
-    "Discussion": "",
-    "Edit": "",
-    "Edit this comment": "",
-    "Edited": "",
-    "Enter your name": "",
-    "Expertise": "",
-    "Founder @ Acme Inc": "",
-    "Full-time parent": "",
-    "Head of Marketing at Acme, Inc": "",
-    "Hide": "",
-    "Hide comment": "",
-    "Jamie Larson": "",
-    "Join the discussion": "",
-    "Just now": "",
-    "Local resident": "",
-    "Member discussion": "",
-    "Name": "",
-    "Neurosurgeon": "",
-    "One day ago": "",
-    "One hour ago": "",
-    "One minute ago": "",
-    "One month ago": "",
-    "One week ago": "",
-    "One year ago": "",
-    "Reply": "",
-    "Reply to comment": "",
-    "Report": "",
-    "Report comment": "",
-    "Report this comment": "",
-    "Report this comment?": "",
-    "Save": "",
-    "Sending": "",
-    "Sent": "",
-    "Show": "",
-    "Show {{amount}} more replies": "",
-    "Show {{amount}} previous comments": "",
-    "Show 1 more reply": "",
-    "Show 1 previous comment": "",
-    "Show comment": "",
-    "Sign in": "",
-    "Sign up now": "",
-    "Start the conversation": "",
-    "This comment has been hidden.": "",
-    "This comment has been removed.": "",
-    "Upgrade now": "",
-    "Yesterday": "",
-    "You want to report this comment?": "",
-    "Your request will be sent to the owner of this site.": ""
+    "{{amount}} characters left": "還剩 {{amount}} 個字",
+    "{{amount}} comments": "{{amount}} 則留言",
+    "{{amount}} days ago": "{{amount}} 天前",
+    "{{amount}} hours ago": "{{amount}} 小時前",
+    "{{amount}} minutes ago": "{{amount}} 分鐘前",
+    "{{amount}} months ago": "{{amount}} 個月前",
+    "{{amount}} more": "還剩 {{amount}} 則留言",
+    "{{amount}} seconds ago": "{{amount}} 秒前",
+    "{{amount}} weeks ago": "{{amount}} 周前",
+    "{{amount}} years ago": "{{amount}} 年前",
+    "1 comment": "一則留言",
+    "Add comment": "留言",
+    "Add context to your comment, share your name and expertise to foster a healthy discussion.": "為您的留言補充情境、說明您的稱呼與專業背景均有助於健康的討論氛圍。",
+    "Add reply": "回覆",
+    "Already a member?": "已經是會員？",
+    "Anonymous": "匿名",
+    "Become a member of {{publication}} to start commenting.": "成為{{publication}}的會員以開始留言。",
+    "Become a paid member of {{publication}} to start commenting.": "成為{{publication}}的付費會員以開始留言。",
+    "Cancel": "取消",
+    "Comment": "留言",
+    "Complete your profile": "完善您的註冊資訊",
+    "Delete": "刪除",
+    "Deleted member": "刪除會員",
+    "Discussion": "討論",
+    "Edit": "編輯",
+    "Edit this comment": "編輯此則留言",
+    "Edited": "已編輯",
+    "Enter your name": "輸入您的稱呼",
+    "Expertise": "專業背景",
+    "Founder @ Acme Inc": "Acme Inc的創辦人",
+    "Full-time parent": "全職父母",
+    "Head of Marketing at Acme, Inc": "Acme, Inc市場部負責人",
+    "Hide": "隱藏",
+    "Hide comment": "隱藏留言",
+    "Jamie Larson": "Jamie Larson",
+    "Join the discussion": "加入討論",
+    "Just now": "剛剛",
+    "Local resident": "本地居民",
+    "Member discussion": "會員討論",
+    "Name": "稱呼",
+    "Neurosurgeon": "神經外科醫生",
+    "One day ago": "一天前",
+    "One hour ago": "一小時前",
+    "One minute ago": "一分鐘前",
+    "One month ago": "一個月前",
+    "One week ago": "一周前",
+    "One year ago": "一年前",
+    "Reply": "回覆",
+    "Reply to comment": "回覆留言",
+    "Report": "舉報",
+    "Report comment": "舉報留言",
+    "Report this comment": "舉報此留言",
+    "Report this comment?": "舉報此留言？",
+    "Save": "儲存",
+    "Sending": "正在發送",
+    "Sent": "已發送",
+    "Show": "顯示",
+    "Show {{amount}} more replies": "顯示後續 {{amount}} 則留言",
+    "Show {{amount}} previous comments": "顯示先前 {{amount}} 則留言",
+    "Show 1 more reply": "顯示下一則留言",
+    "Show 1 previous comment": "顯示前一則留言",
+    "Show comment": "顯示留言",
+    "Sign in": "登錄",
+    "Sign up now": "立即註冊",
+    "Start the conversation": "開始對話",
+    "This comment has been hidden.": "該則留言已被隱藏。",
+    "This comment has been removed.": "該則留言已被移除。",
+    "Upgrade now": "立即升級",
+    "Yesterday": "昨天",
+    "You want to report this comment?": "你想要舉報這則留言嗎？",
+    "Your request will be sent to the owner of this site.": "您的請求將被發送給所有者。"
 }
diff --git a/ghost/i18n/locales/zh-Hant/portal.json b/ghost/i18n/locales/zh-Hant/portal.json
index c751d03473c..2044cbbe552 100644
--- a/ghost/i18n/locales/zh-Hant/portal.json
+++ b/ghost/i18n/locales/zh-Hant/portal.json
@@ -62,7 +62,7 @@
     "Get notified when someone replies to your comment": "當有人回覆我的留言時通知我",
     "Give feedback on this post": "為這篇文章提供意見",
     "Help! I'm not receiving emails": "求救！我沒有收到 email",
-    "Here are a few other sites you may enjoy.": "",
+    "Here are a few other sites you may enjoy.": "這裡有些你可能也有興趣的網站。",
     "If a newsletter is flagged as spam, emails are automatically disabled for that address to make sure you no longer receive any unwanted messages.": "如果有電子報被標記為垃圾郵件，您的 email 地址將自動停止接收該電子報，以確保您不再收到任何不需要的訊息。",
     "If the spam complaint was accidental, or you would like to begin receiving emails again, you can resubscribe to emails by clicking the button on the previous screen.": "如果您不小心將電子報標示成垃圾郵件，或者您希望重新開始接收電子報，您可以點擊前一個畫面上的按鈕以重新訂閱電子報。",
     "If you cancel your subscription now, you will continue to have access until {{periodEnd}}.": "如果現在取消訂閱，您在 {{periodEnd}} 之前仍可存取內容。",
@@ -75,8 +75,8 @@
     "Less like this": "不感興趣",
     "Make sure emails aren't accidentally ending up in the Spam or Promotions folders of your inbox. If they are, click on \"Mark as not spam\" and/or \"Move to inbox\".": "請確保郵件沒有意外地被歸類為垃圾郵件或促銷郵件。如果發生這類情形，請點擊「標記為非垃圾郵件」或「移至收件匣」。",
     "Manage": "管理",
-    "Maybe later": "",
-    "Memberships unavailable, contact the owner for access.": "",
+    "Maybe later": "晚點再說",
+    "Memberships unavailable, contact the owner for access.": "無法存取你的會員資訊，請聯絡客服或是網站的所有人。",
     "Monthly": "每月",
     "More like this": "感興趣",
     "Name": "名字",
@@ -89,11 +89,11 @@
     "Plan": "訂閱方案",
     "Plan checkout was cancelled.": "訂閱付款已取消。",
     "Plan upgrade was cancelled.": "訂閱升級已取消。",
-    "Please contact {{supportAddress}} to adjust your complimentary subscription.": "",
+    "Please contact {{supportAddress}} to adjust your complimentary subscription.": "請聯絡 {{supportAddress}} 來調整你的免費的訂閱。",
     "Please fill in required fields": "請填寫必填項目",
     "Price": "價格",
     "Re-enable emails": "重新啟用 email",
-    "Recommendations": "",
+    "Recommendations": "所有推薦",
     "Renews at {{price}}.": "以 {{price}} 的價格續約。",
     "Retry": "重試",
     "Save": "儲存",
@@ -101,7 +101,7 @@
     "Send an email to {{senderEmail}} and say hello. This can also help signal to your mail provider that emails to-and-from this address should be trusted.": "向 {{senderEmail}} 發送 email 並問好。這也有助於讓您的 email 供應商了解這個地址的往來郵件應該受到信任。",
     "Sending login link...": "正在發送登入連結...",
     "Sending...": "發送中...",
-    "Show all": "",
+    "Show all": "顯示全部",
     "Sign in": "登入",
     "Sign out": "登出",
     "Sign up": "註冊",
@@ -119,7 +119,7 @@
     "Success! Your account is fully activated, you now have access to all content.": "成功了！您的帳號已完全啟用，您現在可以存取所有內容。",
     "Success! Your email is updated.": "成功了！您的 email 已更新。",
     "Successfully unsubscribed": "成功取消訂閱",
-    "Thank you for subscribing. Before you start reading, below are a few other sites you may enjoy.": "",
+    "Thank you for subscribing. Before you start reading, below are a few other sites you may enjoy.": "感謝您的訂閱，以下是一些你可能也會有興趣的網站。",
     "Thanks for the feedback!": "感謝您的意見！",
     "That didn't go to plan": "發生錯誤",
     "The email address we have for you is {{memberEmail}} — if that's not correct, you can update it in your <button>account settings area</button>.": "就我們所知，您的 email 地址是 {{memberEmail}}。如果有誤，您可以在<button>帳號設定區塊</button>進行更新。",
@@ -139,7 +139,7 @@
     "We couldn't unsubscribe you as the email address was not found. Please contact the site owner.": "我們無法取消您的訂閱，因為找不到該 email 地址。請聯繫網站擁有者。",
     "Welcome back, {{name}}!": "歡迎回來，{{name}}！",
     "Welcome back!": "歡迎回來！",
-    "Welcome to {{siteTitle}}": "",
+    "Welcome to {{siteTitle}}": "歡迎來到{{siteTitle}}",
     "When an inbox fails to accept an email it is commonly called a bounce. In many cases, this can be temporary. However, in some cases, a bounced email can be returned as a permanent failure when an email address is invalid or non-existent.": "當收件匣無法接收郵件時，通常稱之為退信。在許多情況下，這可能是暫時的。然而，在某些情況下，當郵件地址無效或不存在時，退回的郵件可能會被視為永久失敗。",
     "Why has my email been disabled?": "為什麼我的 email 被停用了？",
     "Yearly": "年付",
diff --git a/ghost/i18n/package.json b/ghost/i18n/package.json
index 5e153b12514..7b1f9d7173c 100644
--- a/ghost/i18n/package.json
+++ b/ghost/i18n/package.json
@@ -30,6 +30,6 @@
     "mocha": "10.2.0"
   },
   "dependencies": {
-    "i18next": "23.6.0"
+    "i18next": "23.7.3"
   }
 }
diff --git a/ghost/importer-revue/package.json b/ghost/importer-revue/package.json
index 9e08f644638..a81b18a99fd 100644
--- a/ghost/importer-revue/package.json
+++ b/ghost/importer-revue/package.json
@@ -21,9 +21,9 @@
     "sinon": "15.2.0"
   },
   "dependencies": {
-    "@tryghost/debug": "0.1.24",
-    "@tryghost/kg-default-cards": "9.1.8",
-    "@tryghost/string": "0.2.4",
+    "@tryghost/debug": "0.1.26",
+    "@tryghost/kg-default-cards": "9.1.9",
+    "@tryghost/string": "0.2.10",
     "lodash": "4.17.21",
     "papaparse": "5.3.2",
     "simple-dom": "1.4.0"
diff --git a/ghost/link-redirects/package.json b/ghost/link-redirects/package.json
index 8217e53a1db..7af6ea4c01b 100644
--- a/ghost/link-redirects/package.json
+++ b/ghost/link-redirects/package.json
@@ -18,7 +18,7 @@
     "lib"
   ],
   "devDependencies": {
-    "@types/express": "4.17.19",
+    "@types/express": "4.17.21",
     "c8": "8.0.1",
     "mocha": "10.2.0",
     "should": "13.2.3",
diff --git a/ghost/link-tracking/package.json b/ghost/link-tracking/package.json
index 4e0cf432205..a2d4162a9d5 100644
--- a/ghost/link-tracking/package.json
+++ b/ghost/link-tracking/package.json
@@ -27,7 +27,7 @@
     "@tryghost/errors": "1.2.26",
     "@tryghost/link-redirects": "0.0.0",
     "@tryghost/nql": "0.11.0",
-    "@tryghost/tpl": "0.1.24",
+    "@tryghost/tpl": "0.1.26",
     "bson-objectid": "2.0.4",
     "lodash": "4.17.21",
     "moment": "2.29.4"
diff --git a/ghost/magic-link/package.json b/ghost/magic-link/package.json
index 6532a35b222..5e201f34f33 100644
--- a/ghost/magic-link/package.json
+++ b/ghost/magic-link/package.json
@@ -18,8 +18,8 @@
     "lib"
   ],
   "devDependencies": {
-    "@types/jsonwebtoken": "9.0.3",
-    "@types/nodemailer": "6.4.11",
+    "@types/jsonwebtoken": "9.0.5",
+    "@types/nodemailer": "6.4.14",
     "c8": "8.0.1",
     "mocha": "10.2.0",
     "should": "13.2.3",
@@ -27,8 +27,8 @@
   },
   "dependencies": {
     "@tryghost/errors": "1.2.26",
-    "@tryghost/tpl": "0.1.24",
-    "@tryghost/validator": "0.2.4",
+    "@tryghost/tpl": "0.1.26",
+    "@tryghost/validator": "0.2.6",
     "jsonwebtoken": "8.5.1"
   }
 }
diff --git a/ghost/mail-events/package.json b/ghost/mail-events/package.json
index b3458573689..fb81f6ea42d 100644
--- a/ghost/mail-events/package.json
+++ b/ghost/mail-events/package.json
@@ -27,7 +27,7 @@
     "dependencies": {
         "@tryghost/errors": "1.2.26",
         "@tryghost/in-memory-repository": "0.0.0",
-        "@tryghost/tpl": "0.1.25"
+        "@tryghost/tpl": "0.1.26"
     },
     "c8": {
         "exclude": [
diff --git a/ghost/mailgun-client/lib/MailgunClient.js b/ghost/mailgun-client/lib/MailgunClient.js
index 2154fb5f07f..adc4da58ee2 100644
--- a/ghost/mailgun-client/lib/MailgunClient.js
+++ b/ghost/mailgun-client/lib/MailgunClient.js
@@ -73,7 +73,7 @@ module.exports = class MailgunClient {
             // Do we have a custom List-Unsubscribe header set?
             // (we need a variable for this, as this is a per-email setting)
             if (Object.keys(recipientData)[0] && recipientData[Object.keys(recipientData)[0]].list_unsubscribe) {
-                messageData['h:List-Unsubscribe'] = '<%unsubscribe_email%>, <%recipient.list_unsubscribe%>';
+                messageData['h:List-Unsubscribe'] = '<%recipient.list_unsubscribe%>, <%unsubscribe_email%>';
                 messageData['h:List-Unsubscribe-Post'] = 'List-Unsubscribe=One-Click';
             }
 
diff --git a/ghost/mailgun-client/package.json b/ghost/mailgun-client/package.json
index 34daf5e9755..c322e9e3b5d 100644
--- a/ghost/mailgun-client/package.json
+++ b/ghost/mailgun-client/package.json
@@ -24,9 +24,9 @@
     "sinon": "15.2.0"
   },
   "dependencies": {
-    "@tryghost/debug": "0.1.24",
+    "@tryghost/debug": "0.1.26",
     "@tryghost/logging": "2.4.8",
-    "@tryghost/metrics": "1.0.24",
+    "@tryghost/metrics": "1.0.27",
     "form-data": "4.0.0",
     "lodash": "4.17.21",
     "mailgun.js": "9.3.0"
diff --git a/ghost/member-attribution/package.json b/ghost/member-attribution/package.json
index add5147d70f..6faf1a1e056 100644
--- a/ghost/member-attribution/package.json
+++ b/ghost/member-attribution/package.json
@@ -23,6 +23,6 @@
     "@tryghost/domain-events": "0.0.0",
     "@tryghost/member-events": "0.0.0",
     "@tryghost/referrers": "0.0.0",
-    "@tryghost/string": "0.2.4"
+    "@tryghost/string": "0.2.10"
   }
 }
diff --git a/ghost/members-api/lib/services/MemberBREADService.js b/ghost/members-api/lib/services/MemberBREADService.js
index ad99f99d989..c5b61f86dcb 100644
--- a/ghost/members-api/lib/services/MemberBREADService.js
+++ b/ghost/members-api/lib/services/MemberBREADService.js
@@ -325,6 +325,12 @@ module.exports = class MemberBREADService {
         let model;
 
         try {
+            // Update email_disabled based on whether the new email is suppressed
+            if (data.email) {
+                const isSuppressed = (await this.emailSuppressionList.getSuppressionData(data.email))?.suppressed;
+                data.email_disabled = !!isSuppressed;
+            }
+
             model = await this.memberRepository.update(data, options);
         } catch (error) {
             if (error.code && error.message.toLowerCase().indexOf('unique') !== -1) {
diff --git a/ghost/members-api/package.json b/ghost/members-api/package.json
index 321723800aa..2fcb6ee1298 100644
--- a/ghost/members-api/package.json
+++ b/ghost/members-api/package.json
@@ -21,7 +21,7 @@
   ],
   "devDependencies": {
     "@tryghost/member-attribution": "0.0.0",
-    "@types/node-jose": "1.1.11",
+    "@types/node-jose": "1.1.13",
     "c8": "8.0.1",
     "jwk-to-pem": "2.0.5",
     "mocha": "10.2.0",
@@ -37,9 +37,9 @@
     "@tryghost/member-events": "0.0.0",
     "@tryghost/members-payments": "0.0.0",
     "@tryghost/nql": "0.11.0",
-    "@tryghost/tpl": "0.1.24",
-    "@tryghost/validator": "0.2.4",
-    "@types/jsonwebtoken": "9.0.3",
+    "@tryghost/tpl": "0.1.26",
+    "@tryghost/validator": "0.2.6",
+    "@types/jsonwebtoken": "9.0.5",
     "body-parser": "1.20.2",
     "bson-objectid": "2.0.4",
     "express": "4.18.2",
diff --git a/ghost/members-csv/README.md b/ghost/members-csv/README.md
index 6a2b893d1ec..b4c2ea8c0a3 100644
--- a/ghost/members-csv/README.md
+++ b/ghost/members-csv/README.md
@@ -1,7 +1,7 @@
 # Members Csv
 
 ## Usage
-There are 2 parts to this package: CSV to JSON serialization and JSON to CSV serialization. The module exposes 2 methods to fullfil these: `parse` and `unparse` respectively.
+There are 2 parts to this package: CSV to JSON serialization and JSON to CSV serialization. The module exposes 2 methods to fulfil these: `parse` and `unparse` respectively.
 
 To `parse` CSV file and convert it to JSON use `parse` method, e.g.:
 ```js
diff --git a/ghost/members-importer/package.json b/ghost/members-importer/package.json
index 8ef1ce965a7..7cd50a39a37 100644
--- a/ghost/members-importer/package.json
+++ b/ghost/members-importer/package.json
@@ -28,7 +28,7 @@
     "@tryghost/errors": "1.2.26",
     "@tryghost/logging": "2.4.8",
     "@tryghost/members-csv": "0.0.0",
-    "@tryghost/tpl": "0.1.24",
+    "@tryghost/tpl": "0.1.26",
     "moment-timezone": "0.5.23"
   }
 }
diff --git a/ghost/members-ssr/package.json b/ghost/members-ssr/package.json
index 3c9895f2462..b3db9d79153 100644
--- a/ghost/members-ssr/package.json
+++ b/ghost/members-ssr/package.json
@@ -18,7 +18,7 @@
     "lib"
   ],
   "devDependencies": {
-    "@types/cookies": "0.7.8",
+    "@types/cookies": "0.7.10",
     "c8": "8.0.1",
     "keypair": "1.0.4",
     "mocha": "10.2.0",
@@ -26,7 +26,7 @@
     "sinon": "15.2.0"
   },
   "dependencies": {
-    "@tryghost/debug": "0.1.24",
+    "@tryghost/debug": "0.1.26",
     "@tryghost/errors": "1.2.26",
     "cookies": "0.8.0",
     "jsonwebtoken": "8.5.1"
diff --git a/ghost/minifier/package.json b/ghost/minifier/package.json
index f74bb3a1595..f5036753564 100644
--- a/ghost/minifier/package.json
+++ b/ghost/minifier/package.json
@@ -24,11 +24,11 @@
     "sinon": "15.2.0"
   },
   "dependencies": {
-    "@tryghost/debug": "0.1.24",
+    "@tryghost/debug": "0.1.26",
     "@tryghost/errors": "1.2.26",
-    "@tryghost/tpl": "0.1.24",
+    "@tryghost/tpl": "0.1.26",
     "csso": "5.0.5",
-    "terser": "5.22.0",
+    "terser": "5.24.0",
     "tiny-glob": "0.2.9"
   }
 }
diff --git a/ghost/mw-error-handler/lib/mw-error-handler.js b/ghost/mw-error-handler/lib/mw-error-handler.js
index e3cff03b1ec..2be281ef6bb 100644
--- a/ghost/mw-error-handler/lib/mw-error-handler.js
+++ b/ghost/mw-error-handler/lib/mw-error-handler.js
@@ -87,7 +87,17 @@ module.exports.prepareError = (err, req, res, next) => {
                 message: err.message,
                 statusCode: err.statusCode
             });
-        // For everything else, create a generic 500 error, with context set to the original error message
+        // Catch database errors and turn them into 500 errors, but log some useful data to sentry
+        } else if (isDependencyInStack('mysql2', err)) {
+            // we don't want to return raw database errors to our users
+            err.sqlErrorCode = err.code;
+            err = new errors.InternalServerError({
+                err: err,
+                message: tpl(messages.genericError),
+                statusCode: err.statusCode,
+                code: 'UNEXPECTED_ERROR'
+            });
+        // For everything else, create a generic 500 error, with context set to the original error message        
         } else {
             err = new errors.InternalServerError({
                 err: err,
diff --git a/ghost/mw-error-handler/package.json b/ghost/mw-error-handler/package.json
index d188c55cbf6..9e232eaa22e 100644
--- a/ghost/mw-error-handler/package.json
+++ b/ghost/mw-error-handler/package.json
@@ -24,10 +24,10 @@
     "sinon": "15.2.0"
   },
   "dependencies": {
-    "@tryghost/debug": "0.1.24",
+    "@tryghost/debug": "0.1.26",
     "@tryghost/errors": "1.2.26",
-    "@tryghost/http-cache-utils": "0.1.9",
-    "@tryghost/tpl": "0.1.24",
+    "@tryghost/http-cache-utils": "0.1.11",
+    "@tryghost/tpl": "0.1.26",
     "lodash": "4.17.21",
     "semver": "7.5.4"
   }
diff --git a/ghost/mw-error-handler/test/mw-error-handler.test.js b/ghost/mw-error-handler/test/mw-error-handler.test.js
index 63bbfb33fa6..074644e2268 100644
--- a/ghost/mw-error-handler/test/mw-error-handler.test.js
+++ b/ghost/mw-error-handler/test/mw-error-handler.test.js
@@ -104,6 +104,29 @@ describe('Prepare Error', function () {
             done();
         });
     });
+
+    it('Correctly prepares a mysql2 error', function (done) {
+        let error = new Error('select anything from anywhere where something = anything;');
+
+        error.stack += '\n';
+        error.stack += path.join('node_modules', 'mysql2', 'lib');
+        error.code = 'ER_WRONG_VALUE';
+        error.sql = 'select anything from anywhere where something = anything;';
+        error.sqlMessage = 'Incorrect DATETIME value: 3234234234';
+
+        prepareError(error, {}, {
+            set: () => {}
+        }, (err) => {
+            err.statusCode.should.eql(500);
+            err.name.should.eql('InternalServerError');
+            err.message.should.eql('An unexpected error occurred, please try again.');
+            err.code.should.eql('UNEXPECTED_ERROR');
+            err.sqlErrorCode.should.eql('ER_WRONG_VALUE');
+            err.sql.should.eql('select anything from anywhere where something = anything;');
+            err.sqlMessage.should.eql('Incorrect DATETIME value: 3234234234');
+            done();
+        });
+    });
 });
 
 describe('Prepare Stack', function () {
diff --git a/ghost/mw-version-match/package.json b/ghost/mw-version-match/package.json
index a1a1f171474..bbb21c10333 100644
--- a/ghost/mw-version-match/package.json
+++ b/ghost/mw-version-match/package.json
@@ -24,7 +24,7 @@
   },
   "dependencies": {
     "@tryghost/errors": "1.2.26",
-    "@tryghost/tpl": "0.1.24",
+    "@tryghost/tpl": "0.1.26",
     "semver": "7.5.4"
   }
 }
diff --git a/ghost/oembed-service/package.json b/ghost/oembed-service/package.json
index 098b1d70c5d..938f4476988 100644
--- a/ghost/oembed-service/package.json
+++ b/ghost/oembed-service/package.json
@@ -25,20 +25,20 @@
     "@extractus/oembed-extractor": "3.2.1",
     "@tryghost/errors": "1.2.26",
     "@tryghost/logging": "2.4.8",
-    "@tryghost/tpl": "0.1.24",
+    "@tryghost/tpl": "0.1.26",
     "charset": "1.0.1",
     "cheerio": "0.22.0",
     "iconv-lite": "0.6.3",
     "lodash": "4.17.21",
-    "metascraper": "5.37.1",
-    "metascraper-author": "5.37.1",
-    "metascraper-description": "5.37.1",
-    "metascraper-image": "5.37.1",
-    "metascraper-logo": "5.37.1",
-    "metascraper-logo-favicon": "5.37.1",
-    "metascraper-publisher": "5.37.1",
-    "metascraper-title": "5.37.1",
-    "metascraper-url": "5.37.1",
+    "metascraper": "5.38.0",
+    "metascraper-author": "5.38.0",
+    "metascraper-description": "5.38.0",
+    "metascraper-image": "5.38.0",
+    "metascraper-logo": "5.38.0",
+    "metascraper-logo-favicon": "5.38.0",
+    "metascraper-publisher": "5.38.0",
+    "metascraper-title": "5.38.0",
+    "metascraper-url": "5.38.0",
     "tough-cookie": "4.1.3"
   }
 }
diff --git a/ghost/offers/package.json b/ghost/offers/package.json
index 06465f634a4..093f4e4ca62 100644
--- a/ghost/offers/package.json
+++ b/ghost/offers/package.json
@@ -28,7 +28,7 @@
     "@tryghost/domain-events": "0.0.0",
     "@tryghost/errors": "1.2.26",
     "@tryghost/mongo-utils": "0.5.0",
-    "@tryghost/string": "0.2.4",
+    "@tryghost/string": "0.2.10",
     "lodash": "4.17.21"
   }
 }
diff --git a/ghost/package-json/package.json b/ghost/package-json/package.json
index eeaee3b3690..f2010681b8c 100644
--- a/ghost/package-json/package.json
+++ b/ghost/package-json/package.json
@@ -26,7 +26,7 @@
   },
   "dependencies": {
     "@tryghost/errors": "1.2.26",
-    "@tryghost/tpl": "0.1.24",
+    "@tryghost/tpl": "0.1.26",
     "fs-extra": "11.1.1",
     "lodash": "4.17.21"
   }
diff --git a/ghost/posts-service/lib/PostsExporter.js b/ghost/posts-service/lib/PostsExporter.js
index 4b590d97d5d..7f8588cf233 100644
--- a/ghost/posts-service/lib/PostsExporter.js
+++ b/ghost/posts-service/lib/PostsExporter.js
@@ -96,7 +96,7 @@ class PostsExporter {
                 sends: email?.get('email_count') ?? null,
                 opens: trackOpens ? (email?.get('opened_count') ?? null) : null,
                 clicks: showEmailClickAnalytics ? (post.get('count__clicks') ?? 0) : null,
-                free_signups: membersTrackSources && published ? (post.get('count__signups') ?? 0) : null,
+                signups: membersTrackSources && published ? (post.get('count__signups') ?? 0) : null,
                 paid_conversions: membersTrackSources && paidMembersEnabled && published ? (post.get('count__paid_conversions') ?? 0) : null,
                 feedback_more_like_this: feedbackEnabled ? (post.get('count__positive_feedback') ?? 0) : null,
                 feedback_less_like_this: feedbackEnabled ? (post.get('count__negative_feedback') ?? 0) : null
@@ -126,7 +126,7 @@ class PostsExporter {
             }
 
             if (!membersTrackSources || !membersEnabled) {
-                removeableColumns.push('free_signups', 'paid_conversions');
+                removeableColumns.push('signups', 'paid_conversions');
             } else if (!paidMembersEnabled) {
                 removeableColumns.push('paid_conversions');
             }
diff --git a/ghost/posts-service/package.json b/ghost/posts-service/package.json
index c2a41f06377..9d892c1f6ba 100644
--- a/ghost/posts-service/package.json
+++ b/ghost/posts-service/package.json
@@ -26,7 +26,7 @@
     "@tryghost/errors": "1.2.26",
     "@tryghost/nql": "0.11.0",
     "@tryghost/post-events": "0.0.0",
-    "@tryghost/tpl": "0.1.24",
+    "@tryghost/tpl": "0.1.26",
     "bson-objectid": "2.0.4"
   }
 }
diff --git a/ghost/posts-service/test/PostsExporter.test.js b/ghost/posts-service/test/PostsExporter.test.js
index 6d54ef2f32d..3d69b3a9c91 100644
--- a/ghost/posts-service/test/PostsExporter.test.js
+++ b/ghost/posts-service/test/PostsExporter.test.js
@@ -190,7 +190,7 @@ describe('PostsExporter', function () {
             assert.equal(posts[0].newsletter_name, null);
 
             // Signups
-            assert.equal(posts[0].free_signups, null);
+            assert.equal(posts[0].signups, null);
             assert.equal(posts[0].paid_conversions, null);
         });
 
@@ -209,7 +209,7 @@ describe('PostsExporter', function () {
             assert.equal(posts[0].clicks, undefined);
 
             // Signups
-            assert.equal(posts[0].free_signups, undefined);
+            assert.equal(posts[0].signups, undefined);
             assert.equal(posts[0].paid_conversions, undefined);
         });
 
@@ -222,7 +222,7 @@ describe('PostsExporter', function () {
             assert.notEqual(posts[0].feedback_less_like_this, undefined);
             assert.notEqual(posts[0].sends, undefined);
             assert.notEqual(posts[0].opens, undefined);
-            assert.notEqual(posts[0].free_signups, undefined);
+            assert.notEqual(posts[0].signups, undefined);
             assert.notEqual(posts[0].paid_conversions, undefined);
 
             assert.equal(posts[0].clicks, undefined);
@@ -237,7 +237,7 @@ describe('PostsExporter', function () {
             assert.notEqual(posts[0].feedback_less_like_this, undefined);
             assert.notEqual(posts[0].sends, undefined);
             assert.notEqual(posts[0].clicks, undefined);
-            assert.notEqual(posts[0].free_signups, undefined);
+            assert.notEqual(posts[0].signups, undefined);
             assert.notEqual(posts[0].paid_conversions, undefined);
 
             assert.equal(posts[0].opens, undefined);
@@ -252,7 +252,7 @@ describe('PostsExporter', function () {
             assert.notEqual(posts[0].feedback_less_like_this, undefined);
             assert.notEqual(posts[0].sends, undefined);
             assert.notEqual(posts[0].clicks, undefined);
-            assert.notEqual(posts[0].free_signups, undefined);
+            assert.notEqual(posts[0].signups, undefined);
             assert.notEqual(posts[0].opens, undefined);
 
             assert.equal(posts[0].paid_conversions, undefined);
@@ -269,7 +269,7 @@ describe('PostsExporter', function () {
             assert.equal(posts.length, 1);
 
             assert.equal(posts[0].clicks, 0);
-            assert.equal(posts[0].free_signups, 0);
+            assert.equal(posts[0].signups, 0);
             assert.equal(posts[0].paid_conversions, 0);
             assert.equal(posts[0].feedback_more_like_this, 0);
             assert.equal(posts[0].feedback_less_like_this, 0);
diff --git a/ghost/recommendations/package.json b/ghost/recommendations/package.json
index a7e4fe3e22b..4b2e9af88ed 100644
--- a/ghost/recommendations/package.json
+++ b/ghost/recommendations/package.json
@@ -30,7 +30,7 @@
     "typescript": "5.2.2"
   },
   "dependencies": {
-    "@tryghost/tpl": "0.1.25",
+    "@tryghost/tpl": "0.1.26",
     "@tryghost/errors": "1.2.26",
     "@tryghost/in-memory-repository": "0.0.0",
     "@tryghost/bookshelf-repository": "0.0.0",
diff --git a/ghost/recommendations/src/Recommendation.ts b/ghost/recommendations/src/Recommendation.ts
index 8b06805c801..4ff593af7cd 100644
--- a/ghost/recommendations/src/Recommendation.ts
+++ b/ghost/recommendations/src/Recommendation.ts
@@ -181,13 +181,18 @@ export class Recommendation {
     edit(properties: EditRecommendation) {
         // Delete undefined properties
         const newProperties = this.plain;
+        let didChange = false;
 
         for (const key of Object.keys(properties) as (keyof EditRecommendation)[]) {
-            if (Object.prototype.hasOwnProperty.call(properties, key) && properties[key] !== undefined) {
+            if (Object.prototype.hasOwnProperty.call(properties, key) && properties[key] !== undefined && properties[key] !== newProperties[key]) {
                 (newProperties as Record<string, unknown>)[key] = properties[key] as unknown;
+                didChange = true;
             }
         }
 
+        if (!didChange) {
+            return;
+        }
         newProperties.updatedAt = new Date();
 
         const created = Recommendation.create(newProperties);
diff --git a/ghost/recommendations/src/RecommendationController.ts b/ghost/recommendations/src/RecommendationController.ts
index 97af8adb8a2..e9505a771ae 100644
--- a/ghost/recommendations/src/RecommendationController.ts
+++ b/ghost/recommendations/src/RecommendationController.ts
@@ -65,6 +65,22 @@ export class RecommendationController {
         );
     }
 
+    /**
+     * Given a recommendation URL, returns either an existing recommendation with that url and updated metadata,
+     * or the metadata from that URL as if it would create a new one (without creating a new one)
+     *
+     * This can be used in the frontend when creating a new recommendation (duplication checking + showing a preview before saving)
+     */
+    async check(frame: Frame) {
+        const data = new UnsafeData(frame.data);
+        const recommendation = data.key('recommendations').index(0);
+        const url = recommendation.key('url').url;
+
+        return this.#serialize(
+            [await this.service.checkRecommendation(url)]
+        );
+    }
+
     async edit(frame: Frame) {
         const options = new UnsafeData(frame.options);
         const data = new UnsafeData(frame.data);
@@ -201,19 +217,19 @@ export class RecommendationController {
         return null;
     }
 
-    #serialize(recommendations: RecommendationPlain[], meta?: any) {
+    #serialize(recommendations: Partial<RecommendationPlain>[], meta?: any) {
         return {
             data: recommendations.map((entity) => {
                 const d = {
-                    id: entity.id,
-                    title: entity.title,
-                    description: entity.description,
-                    excerpt: entity.excerpt,
+                    id: entity.id ?? null,
+                    title: entity.title ?? null,
+                    description: entity.description ?? null,
+                    excerpt: entity.excerpt ?? null,
                     featured_image: entity.featuredImage?.toString() ?? null,
                     favicon: entity.favicon?.toString() ?? null,
-                    url: entity.url.toString(),
-                    one_click_subscribe: entity.oneClickSubscribe,
-                    created_at: entity.createdAt.toISOString(),
+                    url: entity.url?.toString() ?? null,
+                    one_click_subscribe: entity.oneClickSubscribe ?? null,
+                    created_at: entity.createdAt?.toISOString() ?? null,
                     updated_at: entity.updatedAt?.toISOString() ?? null,
                     count: entity.clickCount !== undefined || entity.subscriberCount !== undefined ? {
                         clicks: entity.clickCount,
diff --git a/ghost/recommendations/src/RecommendationMetadataService.ts b/ghost/recommendations/src/RecommendationMetadataService.ts
new file mode 100644
index 00000000000..9d6e5f947c5
--- /dev/null
+++ b/ghost/recommendations/src/RecommendationMetadataService.ts
@@ -0,0 +1,119 @@
+type OembedMetadata<Type extends string> = {
+    version: '1.0',
+    type: Type,
+    url: string,
+    metadata: {
+        title: string|null,
+        description: string|null,
+        publisher: string|null,
+        author: string|null,
+        thumbnail: string|null,
+        icon: string|null
+    },
+    body?: Type extends 'mention' ? string : unknown,
+    contentType?: Type extends 'mention' ? string : unknown
+}
+
+type OEmbedService = {
+    fetchOembedDataFromUrl<Type extends string>(url: string, type: Type, options?: {timeout?: number}): Promise<OembedMetadata<Type>>
+}
+
+type ExternalRequest = {
+    get(url: string, options: object): Promise<{statusCode: number, body: string}>
+}
+
+export type RecommendationMetadata = {
+    title: string|null,
+    excerpt: string|null,
+    featuredImage: URL|null,
+    favicon: URL|null,
+    oneClickSubscribe: boolean
+}
+
+export class RecommendationMetadataService {
+    #oembedService: OEmbedService;
+    #externalRequest: ExternalRequest;
+
+    constructor(dependencies: {oembedService: OEmbedService, externalRequest: ExternalRequest}) {
+        this.#oembedService = dependencies.oembedService;
+        this.#externalRequest = dependencies.externalRequest;
+    }
+
+    async #fetchJSON(url: URL, options?: {timeout?: number}) {
+        // default content type is application/x-www-form-encoded which is what we need for the webmentions spec
+        const response = await this.#externalRequest.get(url.toString(), {
+            throwHttpErrors: false,
+            maxRedirects: 10,
+            followRedirect: true,
+            timeout: 15000,
+            retry: {
+                // Only retry on network issues, or specific HTTP status codes
+                limit: 3
+            },
+            ...options
+        });
+
+        if (response.statusCode >= 200 && response.statusCode < 300) {
+            try {
+                return JSON.parse(response.body);
+            } catch (e) {
+                return undefined;
+            }
+        }
+    }
+
+    #castUrl(url: string|null|undefined): URL|null {
+        if (!url) {
+            return null;
+        }
+        try {
+            return new URL(url);
+        } catch (e) {
+            return null;
+        }
+    }
+
+    async fetch(url: URL, options: {timeout: number} = {timeout: 5000}): Promise<RecommendationMetadata> {
+        // Make sure url path ends with a slash (urls should be resolved relative to the path)
+        if (!url.pathname.endsWith('/')) {
+            url.pathname += '/';
+        }
+
+        // 1. Check if it is a Ghost site
+        let ghostSiteData = await this.#fetchJSON(
+            new URL('members/api/site', url),
+            options
+        );
+
+        if (!ghostSiteData && url.pathname !== '' && url.pathname !== '/') {
+            // Try root relative URL
+            ghostSiteData = await this.#fetchJSON(
+                new URL('members/api/site', url.origin),
+                options
+            );
+        }
+
+        if (ghostSiteData && typeof ghostSiteData === 'object' && ghostSiteData.site && typeof ghostSiteData.site === 'object') {
+            // Check if the Ghost site returns allow_external_signup, otherwise it is an old Ghost version that returns unreliable data
+            if (typeof ghostSiteData.site.allow_external_signup === 'boolean') {
+                return {
+                    title: ghostSiteData.site.title || null,
+                    excerpt: ghostSiteData.site.description || null,
+                    featuredImage: this.#castUrl(ghostSiteData.site.cover_image),
+                    favicon: this.#castUrl(ghostSiteData.site.icon || ghostSiteData.site.logo),
+                    oneClickSubscribe: !!ghostSiteData.site.allow_external_signup
+                };
+            }
+        }
+
+        // Use the oembed service to fetch metadata
+        const oembed = await this.#oembedService.fetchOembedDataFromUrl(url.toString(), 'mention');
+        return {
+            title: oembed?.metadata?.title || null,
+            excerpt: oembed?.metadata?.description || null,
+            featuredImage: this.#castUrl(oembed?.metadata?.thumbnail),
+            favicon: this.#castUrl(oembed?.metadata?.icon),
+            oneClickSubscribe: false
+        };
+    }
+}
diff --git a/ghost/recommendations/src/RecommendationService.ts b/ghost/recommendations/src/RecommendationService.ts
index dcd9f0373cb..8326d54be83 100644
--- a/ghost/recommendations/src/RecommendationService.ts
+++ b/ghost/recommendations/src/RecommendationService.ts
@@ -8,6 +8,7 @@ import {AddRecommendation, Recommendation, RecommendationPlain} from './Recommen
 import {RecommendationRepository} from './RecommendationRepository';
 import {SubscribeEvent} from './SubscribeEvent';
 import {WellknownService} from './WellknownService';
+import {RecommendationMetadataService} from './RecommendationMetadataService';
 
 type MentionSendingService = {
     sendAll(options: {url: URL, links: URL[]}): Promise<void>
@@ -30,6 +31,7 @@ export class RecommendationService {
     wellknownService: WellknownService;
     mentionSendingService: MentionSendingService;
     recommendationEnablerService: RecommendationEnablerService;
+    recommendationMetadataService: RecommendationMetadataService;
 
     constructor(deps: {
         repository: RecommendationRepository,
@@ -37,7 +39,8 @@ export class RecommendationService {
         subscribeEventRepository: InMemoryRepository<string, SubscribeEvent>,
         wellknownService: WellknownService,
         mentionSendingService: MentionSendingService,
-        recommendationEnablerService: RecommendationEnablerService
+        recommendationEnablerService: RecommendationEnablerService,
+        recommendationMetadataService: RecommendationMetadataService
     }) {
         this.repository = deps.repository;
         this.wellknownService = deps.wellknownService;
@@ -45,11 +48,37 @@ export class RecommendationService {
         this.recommendationEnablerService = deps.recommendationEnablerService;
         this.clickEventRepository = deps.clickEventRepository;
         this.subscribeEventRepository = deps.subscribeEventRepository;
+        this.recommendationMetadataService = deps.recommendationMetadataService;
     }
 
     async init() {
         const recommendations = await this.#listRecommendations();
         await this.updateWellknown(recommendations);
+
+        // Do a slow update of all the recommendation metadata (keeping logo up to date, one-click-subscribe, etc.)
+        // We better move this to a job in the future
+        if (!process.env.NODE_ENV?.startsWith('test')) {
+            setTimeout(async () => {
+                try {
+                    await this.updateAllRecommendationsMetadata();
+                } catch (e) {
+                    logging.error('[Recommendations] Failed to update all recommendations metadata on boot', e);
+                }
+            }, 2 * 60 * 1000 + Math.random() * 5 * 60 * 1000);
+        }
+    }
+
+    async updateAllRecommendationsMetadata() {
+        const recommendations = await this.#listRecommendations();
+        logging.info('[Recommendations] Updating recommendations metadata');
+        for (const recommendation of recommendations) {
+            try {
+                await this._updateRecommendationMetadata(recommendation);
+                await this.repository.save(recommendation);
+            } catch (e) {
+                logging.error('[Recommendations] Failed to save updated metadata for recommendation ' + recommendation.url.toString(), e);
+            }
+        }
     }
 
     async updateWellknown(recommendations: Recommendation[]) {
@@ -112,6 +141,45 @@ export class RecommendationService {
         return recommendation.plain;
     }
 
+    async checkRecommendation(url: URL): Promise<Partial<RecommendationPlain>> {
+        // If a recommendation with this URL already exists, return it, but with updated metadata
+        const existing = await this.repository.getByUrl(url);
+        if (existing) {
+            this._updateRecommendationMetadata(existing);
+            await this.repository.save(existing);
+            return existing.plain;
+        }
+
+        const metadata = await this.recommendationMetadataService.fetch(url);
+        return {
+            url: url,
+            title: metadata.title ?? undefined,
+            excerpt: metadata.excerpt ?? undefined,
+            featuredImage: metadata.featuredImage ?? undefined,
+            favicon: metadata.favicon ?? undefined,
+            oneClickSubscribe: !!metadata.oneClickSubscribe
+        };
+    }
+
+    async _updateRecommendationMetadata(recommendation: Recommendation) {
+        // Fetch data
+        try {
+            const metadata = await this.recommendationMetadataService.fetch(recommendation.url);
+
+            // Set null values to undefined so we don't trigger an update
+            recommendation.edit({
+                // Don't set title if it's already set on the recommendation
+                title: recommendation.title ? undefined : (metadata.title ?? undefined),
+                excerpt: metadata.excerpt ?? undefined,
+                featuredImage: metadata.featuredImage ?? undefined,
+                favicon: metadata.favicon ?? undefined,
+                oneClickSubscribe: !!metadata.oneClickSubscribe
+            });
+        } catch (e) {
+            logging.error('[Recommendations] Failed to update metadata for recommendation ' + recommendation.url.toString(), e);
+        }
+    }
+
     async editRecommendation(id: string, recommendationEdit: Partial<Recommendation>): Promise<RecommendationPlain> {
         // Check if it exists
         const existing = await this.repository.getById(id);
@@ -122,6 +190,7 @@ export class RecommendationService {
         }
 
         existing.edit(recommendationEdit);
+        await this._updateRecommendationMetadata(existing);
         await this.repository.save(existing);
 
         const recommendations = await this.#listRecommendations();
diff --git a/ghost/recommendations/src/index.ts b/ghost/recommendations/src/index.ts
index 784a6c80b3a..482b9d62aec 100644
--- a/ghost/recommendations/src/index.ts
+++ b/ghost/recommendations/src/index.ts
@@ -12,3 +12,4 @@ export * from './BookshelfSubscribeEventRepository';
 export * from './IncomingRecommendationController';
 export * from './IncomingRecommendationService';
 export * from './IncomingRecommendationEmailRenderer';
+export * from './RecommendationMetadataService';
diff --git a/ghost/recommendations/test/Recommendation.test.ts b/ghost/recommendations/test/Recommendation.test.ts
index e3afbc541e3..a88e645d701 100644
--- a/ghost/recommendations/test/Recommendation.test.ts
+++ b/ghost/recommendations/test/Recommendation.test.ts
@@ -173,6 +173,30 @@ describe('Recommendation', function () {
             assert.notEqual(recommendation.updatedAt, null);
         });
 
+        it('does not change updatedAt if nothing changed', function () {
+            const recommendation = Recommendation.create({
+                title: 'Test',
+                description: null,
+                excerpt: null,
+                featuredImage: null,
+                favicon: null,
+                url: 'https://example.com',
+                oneClickSubscribe: false,
+                createdAt: new Date('2021-01-01T00:00:05Z'),
+                updatedAt: null
+            });
+            assert.equal(recommendation.updatedAt, null);
+
+            recommendation.edit({
+                title: 'Test',
+                url: undefined
+            } as any);
+
+            assert.equal(recommendation.title, 'Test');
+            assert.equal(recommendation.url.toString(), 'https://example.com/');
+            assert.equal(recommendation.updatedAt, null);
+        });
+
         it('can not edit unknown properties', function () {
             const recommendation = Recommendation.create({
                 title: 'Test',
diff --git a/ghost/recommendations/test/RecommendationController.test.ts b/ghost/recommendations/test/RecommendationController.test.ts
index 31bdb09d510..fb27a224535 100644
--- a/ghost/recommendations/test/RecommendationController.test.ts
+++ b/ghost/recommendations/test/RecommendationController.test.ts
@@ -156,6 +156,84 @@ describe('RecommendationController', function () {
         });
     });
 
+    describe('check', function () {
+        it('should return url metadata', async function () {
+            service.checkRecommendation = async (url) => {
+                return {
+                    excerpt: 'Updated excerpt',
+                    url
+                };
+            };
+
+            const result = await controller.check({
+                data: {
+                    recommendations: [
+                        {
+                            url: 'https://example.com/'
+                        }
+                    ]
+                },
+                options: {},
+                user: {}
+            });
+
+            assert.deepEqual(result, {
+                data: [{
+                    excerpt: 'Updated excerpt',
+                    created_at: null,
+                    updated_at: null,
+                    description: null,
+                    favicon: null,
+                    featured_image: null,
+                    id: null,
+                    one_click_subscribe: null,
+                    title: null,
+                    url: 'https://example.com/',
+                    count: undefined
+                }],
+                meta: undefined
+            });
+        });
+
+        it('should serialize undefined url', async function () {
+            service.checkRecommendation = async () => {
+                return {
+                    excerpt: 'Updated excerpt',
+                    url: undefined
+                };
+            };
+
+            const result = await controller.check({
+                data: {
+                    recommendations: [
+                        {
+                            url: 'https://example.com/'
+                        }
+                    ]
+                },
+                options: {},
+                user: {}
+            });
+
+            assert.deepEqual(result, {
+                data: [{
+                    excerpt: 'Updated excerpt',
+                    created_at: null,
+                    updated_at: null,
+                    description: null,
+                    favicon: null,
+                    featured_image: null,
+                    id: null,
+                    one_click_subscribe: null,
+                    title: null,
+                    url: null,
+                    count: undefined
+                }],
+                meta: undefined
+            });
+        });
+    });
+
     describe('edit', function () {
         it('should edit a recommendation', async function () {
             service.editRecommendation = async (id, edit) => {
diff --git a/ghost/recommendations/test/RecommendationMetadataService.test.ts b/ghost/recommendations/test/RecommendationMetadataService.test.ts
new file mode 100644
index 00000000000..dd58cbffea2
--- /dev/null
+++ b/ghost/recommendations/test/RecommendationMetadataService.test.ts
@@ -0,0 +1,215 @@
+import assert from 'assert/strict';
+import got from 'got';
+import nock from 'nock';
+import {RecommendationMetadataService} from '../src';
+import sinon from 'sinon';
+
+describe('RecommendationMetadataService', function () {
+    let service: RecommendationMetadataService;
+    let fetchOembedDataFromUrl: sinon.SinonStub;
+
+    beforeEach(function () {
+        nock.disableNetConnect();
+        fetchOembedDataFromUrl = sinon.stub().resolves({
+            version: '1.0',
+            type: 'webmention',
+            metadata: {
+                title: 'Oembed Site Title',
+                description: 'Oembed Site Description',
+                publisher: 'Oembed Site Publisher',
+                author: 'Oembed Site Author',
+                thumbnail: 'https://example.com/oembed/thumbnail.png',
+                icon: 'https://example.com/oembed/icon.png'
+            }
+        });
+        service = new RecommendationMetadataService({
+            externalRequest: got,
+            oembedService: {
+                fetchOembedDataFromUrl
+            }
+        });
+    });
+
+    afterEach(function () {
+        nock.cleanAll();
+    });
+
+    it('Returns metadata from the Ghost site', async function () {
+        nock('https://exampleghostsite.com')
+            .get('/subdirectory/members/api/site')
+            .reply(200, {
+                site: {
+                    title: 'Example Ghost Site',
+                    description: 'Example Ghost Site Description',
+                    cover_image: 'https://exampleghostsite.com/cover.png',
+                    icon: 'https://exampleghostsite.com/favicon.ico',
+                    allow_external_signup: true
+                }
+            });
+
+        const metadata = await service.fetch(new URL('https://exampleghostsite.com/subdirectory'));
+        assert.deepEqual(metadata, {
+            title: 'Example Ghost Site',
+            excerpt: 'Example Ghost Site Description',
+            featuredImage: new URL('https://exampleghostsite.com/cover.png'),
+            favicon: new URL('https://exampleghostsite.com/favicon.ico'),
+            oneClickSubscribe: true
+        });
+    });
+
+    it('Nulifies empty data from Ghost site response', async function () {
+        nock('https://exampleghostsite.com')
+            .get('/subdirectory/members/api/site')
+            .reply(200, {
+                site: {
+                    title: '',
+                    description: '',
+                    cover_image: '',
+                    icon: '',
+                    allow_external_signup: false
+                }
+            });
+
+        const metadata = await service.fetch(new URL('https://exampleghostsite.com/subdirectory'));
+        assert.deepEqual(metadata, {
+            title: null,
+            excerpt: null,
+            featuredImage: null,
+            favicon: null,
+            oneClickSubscribe: false
+        });
+    });
+
+    it('Ignores ghost site if allow_external_signup is missing', async function () {
+        nock('https://exampleghostsite.com')
+            .get('/members/api/site')
+            .reply(200, {
+                site: {
+                    title: '',
+                    description: '',
+                    cover_image: '',
+                    icon: ''
+                }
+            });
+
+        const metadata = await service.fetch(new URL('https://exampleghostsite.com'));
+        assert.deepEqual(metadata, {
+            // oembed
+            title: 'Oembed Site Title',
+            excerpt: 'Oembed Site Description',
+            featuredImage: new URL('https://example.com/oembed/thumbnail.png'),
+            favicon: new URL('https://example.com/oembed/icon.png'),
+            oneClickSubscribe: false
+        });
+    });
+
+    it('Returns metadata from the Ghost site root if not found on subdirectory', async function () {
+        nock('https://exampleghostsite.com')
+            .get('/subdirectory/members/api/site')
+            .reply(404, {});
+
+        nock('https://exampleghostsite.com')
+            .get('/members/api/site')
+            .reply(200, {
+                site: {
+                    title: 'Example Ghost Site',
+                    description: 'Example Ghost Site Description',
+                    cover_image: 'https://exampleghostsite.com/cover.png',
+                    icon: 'https://exampleghostsite.com/favicon.ico',
+                    allow_external_signup: true
+                }
+            });
+
+        const metadata = await service.fetch(new URL('https://exampleghostsite.com/subdirectory'));
+        assert.deepEqual(metadata, {
+            title: 'Example Ghost Site',
+            excerpt: 'Example Ghost Site Description',
+            featuredImage: new URL('https://exampleghostsite.com/cover.png'),
+            favicon: new URL('https://exampleghostsite.com/favicon.ico'),
+            oneClickSubscribe: true
+        });
+    });
+
+    it('Skips ghost metadata if json is invalid', async function () {
+        nock('https://exampleghostsite.com')
+            .get('/subdirectory/members/api/site')
+            .reply(200, 'invalidjson');
+
+        nock('https://exampleghostsite.com')
+            .get('/members/api/site')
+            .reply(200, 'invalidjson');
+
+        const metadata = await service.fetch(new URL('https://exampleghostsite.com/subdirectory'));
+        assert.deepEqual(metadata, {
+            title: 'Oembed Site Title',
+            excerpt: 'Oembed Site Description',
+            featuredImage: new URL('https://example.com/oembed/thumbnail.png'),
+            favicon: new URL('https://example.com/oembed/icon.png'),
+            oneClickSubscribe: false
+        });
+    });
+
+    it('Ignores invalid urls', async function () {
+        nock('https://exampleghostsite.com')
+            .get('/subdirectory/members/api/site')
+            .reply(404, 'invalidjson');
+
+        nock('https://exampleghostsite.com')
+            .get('/members/api/site')
+            .reply(404, 'invalidjson');
+
+        fetchOembedDataFromUrl.resolves({
+            version: '1.0',
+            type: 'webmention',
+            metadata: {
+                title: 'Oembed Site Title',
+                description: 'Oembed Site Description',
+                publisher: 'Oembed Site Publisher',
+                author: 'Oembed Site Author',
+                thumbnail: 'invalid',
+                icon: 'invalid'
+            }
+        });
+
+        const metadata = await service.fetch(new URL('https://exampleghostsite.com/subdirectory'));
+        assert.deepEqual(metadata, {
+            title: 'Oembed Site Title',
+            excerpt: 'Oembed Site Description',
+            featuredImage: null,
+            favicon: null,
+            oneClickSubscribe: false
+        });
+    });
+
+    it('Nullifies empty oembed data', async function () {
+        nock('https://exampleghostsite.com')
+            .get('/subdirectory/members/api/site')
+            .reply(404, 'invalidjson');
+
+        nock('https://exampleghostsite.com')
+            .get('/members/api/site')
+            .reply(404, 'invalidjson');
+
+        fetchOembedDataFromUrl.resolves({
+            version: '1.0',
+            type: 'webmention',
+            metadata: {
+                title: '',
+                description: '',
+                publisher: '',
+                author: '',
+                thumbnail: '',
+                icon: ''
+            }
+        });
+
+        const metadata = await service.fetch(new URL('https://exampleghostsite.com/subdirectory'));
+        assert.deepEqual(metadata, {
+            title: null,
+            excerpt: null,
+            featuredImage: null,
+            favicon: null,
+            oneClickSubscribe: false
+        });
+    });
+});
diff --git a/ghost/recommendations/test/RecommendationService.test.ts b/ghost/recommendations/test/RecommendationService.test.ts
index 67198a51ede..c7af99693fa 100644
--- a/ghost/recommendations/test/RecommendationService.test.ts
+++ b/ghost/recommendations/test/RecommendationService.test.ts
@@ -1,5 +1,5 @@
 import assert from 'assert/strict';
-import {ClickEvent, InMemoryRecommendationRepository, Recommendation, RecommendationService, SubscribeEvent, WellknownService} from '../src';
+import {ClickEvent, InMemoryRecommendationRepository, Recommendation, RecommendationService, SubscribeEvent, WellknownService, RecommendationMetadata, RecommendationMetadataService} from '../src';
 import {InMemoryRepository} from '@tryghost/in-memory-repository';
 import sinon from 'sinon';
 
@@ -12,9 +12,18 @@ class InMemoryClickEventRepository<T extends ClickEvent|SubscribeEvent> extends
 describe('RecommendationService', function () {
     let service: RecommendationService;
     let enabled = false;
+    let clock: sinon.SinonFakeTimers;
+    let fetchMetadataStub: sinon.SinonStub<any[], Promise<RecommendationMetadata>>;
 
     beforeEach(function () {
         enabled = false;
+        fetchMetadataStub = sinon.stub().resolves({
+            title: 'Test',
+            excerpt: null,
+            featuredImage: null,
+            favicon: null,
+            oneClickSubscribe: false
+        });
         service = new RecommendationService({
             repository: new InMemoryRecommendationRepository(),
             clickEventRepository: new InMemoryClickEventRepository<ClickEvent>(),
@@ -43,8 +52,17 @@ describe('RecommendationService', function () {
                     enabled = e === 'true';
                     return Promise.resolve();
                 }
-            }
+            },
+            recommendationMetadataService: {
+                fetch: fetchMetadataStub
+            } as unknown as RecommendationMetadataService
         });
+        clock = sinon.useFakeTimers();
+    });
+
+    afterEach(function () {
+        sinon.restore();
+        clock.restore();
     });
 
     describe('init', function () {
@@ -53,6 +71,215 @@ describe('RecommendationService', function () {
             await service.init();
             assert(updateWellknown.calledOnce);
         });
+
+        it('should update recommendations on boot', async function () {
+            const recommendation = Recommendation.create({
+                id: '2',
+                url: 'http://localhost/1',
+                title: 'Test',
+                description: null,
+                excerpt: null,
+                featuredImage: null,
+                favicon: null,
+                oneClickSubscribe: false
+            });
+            await service.repository.save(recommendation);
+
+            // Sandbox time
+            const saved = process.env.NODE_ENV;
+            try {
+                process.env.NODE_ENV = 'development';
+                const spy = sinon.spy(service, 'updateAllRecommendationsMetadata');
+                await service.init();
+                await clock.tick(1000 * 60 * 60 * 24);
+                assert(spy.calledOnce);
+            } finally {
+                process.env.NODE_ENV = saved;
+            }
+        });
+
+        it('ignores errors when update recommendations on boot', async function () {
+            // Sandbox time
+            const saved = process.env.NODE_ENV;
+            try {
+                process.env.NODE_ENV = 'development';
+                const spy = sinon.stub(service, 'updateAllRecommendationsMetadata');
+                spy.rejects(new Error('test'));
+                await service.init();
+                clock.tick(1000 * 60 * 60 * 24);
+                assert(spy.calledOnce);
+            } finally {
+                process.env.NODE_ENV = saved;
+            }
+        });
+
+        it('should errors when update recommendations on boot (invidiual)', async function () {
+            const recommendation = Recommendation.create({
+                id: '2',
+                url: 'http://localhost/1',
+                title: 'Test',
+                description: null,
+                excerpt: null,
+                featuredImage: null,
+                favicon: null,
+                oneClickSubscribe: false
+            });
+            await service.repository.save(recommendation);
+
+            // Sandbox time
+            const saved = process.env.NODE_ENV;
+            try {
+                process.env.NODE_ENV = 'development';
+                const spy = sinon.stub(service, '_updateRecommendationMetadata');
+                spy.rejects(new Error('This is a test'));
+                await service.init();
+                clock.tick(1000 * 60 * 60 * 24);
+                clock.restore();
+                // This assert doesn't work without a timeout because the timeout in boot is async
+                // eslint-disable-next-line no-promise-executor-return
+                await new Promise((resolve) => {
+                    setTimeout(() => resolve(true), 50);
+                });
+                assert(!!spy.calledOnce);
+            } finally {
+                process.env.NODE_ENV = saved;
+            }
+        });
+    });
+
+    describe('checkRecommendation', function () {
+        it('Returns existing recommendation if found', async function () {
+            const recommendation = Recommendation.create({
+                id: '2',
+                url: 'http://localhost/existing',
+                title: 'Test',
+                description: null,
+                excerpt: null,
+                featuredImage: null,
+                favicon: null,
+                oneClickSubscribe: false
+            });
+            await service.repository.save(recommendation);
+
+            const response = await service.checkRecommendation(new URL('http://localhost/existing'));
+            assert.deepEqual(response, recommendation.plain);
+        });
+
+        it('Returns updated recommendation if found', async function () {
+            const recommendation = Recommendation.create({
+                id: '2',
+                url: 'http://localhost/existing',
+                title: 'Test',
+                description: null,
+                excerpt: null,
+                featuredImage: null,
+                favicon: null,
+                oneClickSubscribe: false
+            });
+            // Force an empty title (shouldn't be possible)
+            recommendation.title = '';
+            await service.repository.save(recommendation);
+
+            fetchMetadataStub.resolves({
+                title: 'Test 2',
+                excerpt: 'Test excerpt',
+                featuredImage: new URL('https://example.com/image.png'),
+                favicon: new URL('https://example.com/favicon.ico'),
+                oneClickSubscribe: true
+            });
+
+            const response = await service.checkRecommendation(new URL('http://localhost/existing'));
+            assert.deepEqual(response, {
+                ...recommendation.plain,
+                // Note: Title only changes if it was empty
+                title: 'Test 2',
+                description: null,
+                excerpt: 'Test excerpt',
+                featuredImage: new URL('https://example.com/image.png'),
+                favicon: new URL('https://example.com/favicon.ico'),
+                oneClickSubscribe: true
+            });
+        });
+
+        it('Returns updated recommendation if found but keeps empty title if no title found', async function () {
+            const recommendation = Recommendation.create({
+                id: '2',
+                url: 'http://localhost/existing',
+                title: 'Test',
+                description: null,
+                excerpt: null,
+                featuredImage: null,
+                favicon: null,
+                oneClickSubscribe: false
+            });
+            // Force an empty title (shouldn't be possible)
+            recommendation.title = '';
+            await service.repository.save(recommendation);
+
+            fetchMetadataStub.resolves({
+                title: null,
+                excerpt: 'Test excerpt',
+                featuredImage: new URL('https://example.com/image.png'),
+                favicon: new URL('https://example.com/favicon.ico'),
+                oneClickSubscribe: true
+            });
+
+            const response = await service.checkRecommendation(new URL('http://localhost/existing'));
+
+            // No changes here, because validation failed with an empty title
+            assert.deepEqual(response, {
+                ...recommendation.plain
+            });
+        });
+
+        it('Returns existing recommendation if found and fetch failes', async function () {
+            const recommendation = Recommendation.create({
+                id: '2',
+                url: 'http://localhost/existing',
+                title: 'Outdated title',
+                description: null,
+                excerpt: null,
+                featuredImage: null,
+                favicon: null,
+                oneClickSubscribe: false
+            });
+            await service.repository.save(recommendation);
+
+            fetchMetadataStub.rejects(new Error('Test'));
+            const response = await service.checkRecommendation(new URL('http://localhost/existing'));
+            assert.deepEqual(response, recommendation.plain);
+        });
+
+        it('Returns recommendation metadata if not found', async function () {
+            const response = await service.checkRecommendation(new URL('http://localhost/newone'));
+            assert.deepEqual(response, {
+                title: 'Test',
+                excerpt: undefined,
+                featuredImage: undefined,
+                favicon: undefined,
+                oneClickSubscribe: false,
+                url: new URL('http://localhost/newone')
+            });
+        });
+
+        it('Returns recommendation metadata if not found with all data except title', async function () {
+            fetchMetadataStub.resolves({
+                title: null,
+                excerpt: 'Test excerpt',
+                featuredImage: new URL('https://example.com/image.png'),
+                favicon: new URL('https://example.com/favicon.ico'),
+                oneClickSubscribe: true
+            });
+            const response = await service.checkRecommendation(new URL('http://localhost/newone'));
+            assert.deepEqual(response, {
+                title: undefined,
+                excerpt: 'Test excerpt',
+                featuredImage: new URL('https://example.com/image.png'),
+                favicon: new URL('https://example.com/favicon.ico'),
+                oneClickSubscribe: true,
+                url: new URL('http://localhost/newone')
+            });
+        });
     });
 
     describe('updateRecommendationsEnabledSetting', function () {
diff --git a/ghost/security/package.json b/ghost/security/package.json
index 6ca19bff4a6..cc2d0006e76 100644
--- a/ghost/security/package.json
+++ b/ghost/security/package.json
@@ -25,7 +25,7 @@
     "uuid": "9.0.1"
   },
   "dependencies": {
-    "@tryghost/string": "0.2.4",
+    "@tryghost/string": "0.2.10",
     "bcryptjs": "2.4.3"
   }
 }
diff --git a/ghost/settings-path-manager/package.json b/ghost/settings-path-manager/package.json
index 9144f1fa5bb..c6253e3f4d4 100644
--- a/ghost/settings-path-manager/package.json
+++ b/ghost/settings-path-manager/package.json
@@ -25,7 +25,7 @@
   },
   "dependencies": {
     "@tryghost/errors": "1.2.26",
-    "@tryghost/tpl": "0.1.24",
+    "@tryghost/tpl": "0.1.26",
     "date-fns": "2.30.0"
   }
 }
diff --git a/ghost/slack-notifications/package.json b/ghost/slack-notifications/package.json
index ee43cf6d3b2..9a662607116 100644
--- a/ghost/slack-notifications/package.json
+++ b/ghost/slack-notifications/package.json
@@ -24,8 +24,8 @@
   },
   "dependencies": {
     "@tryghost/errors": "1.2.26",
-    "@tryghost/validator": "0.2.4",
-    "@tryghost/version": "0.1.22",
+    "@tryghost/validator": "0.2.6",
+    "@tryghost/version": "0.1.24",
     "got": "9.6.0"
   }
 }
diff --git a/ghost/staff-service/lib/StaffServiceEmails.js b/ghost/staff-service/lib/StaffServiceEmails.js
index 19d3da73a77..c96c64cc908 100644
--- a/ghost/staff-service/lib/StaffServiceEmails.js
+++ b/ghost/staff-service/lib/StaffServiceEmails.js
@@ -419,11 +419,6 @@ class StaffServiceEmails {
         return this.settingsHelpers.getDefaultEmailDomain();
     }
 
-    get membersAddress() {
-        // TODO: get from address of default newsletter?
-        return `noreply@${this.defaultEmailDomain}`;
-    }
-
     get fromEmailAddress() {
         return `ghost@${this.defaultEmailDomain}`;
     }
diff --git a/ghost/staff-service/lib/email-templates/partials/styles.hbs b/ghost/staff-service/lib/email-templates/partials/styles.hbs
index 891fb172b88..10a74ed21c3 100644
--- a/ghost/staff-service/lib/email-templates/partials/styles.hbs
+++ b/ghost/staff-service/lib/email-templates/partials/styles.hbs
@@ -99,4 +99,11 @@
     padding-left: 20px;
     border-left: 3px solid #DDE1E5;
   }
+  .recommendation-card--outlook {
+	margin: 0;
+    padding: 0;
+    width: 100%;
+    border: 1px solid #F9F9FA;
+    background: #F9F9FA;
+  }
 </style>
diff --git a/ghost/staff-service/lib/email-templates/recommendation-received.hbs b/ghost/staff-service/lib/email-templates/recommendation-received.hbs
index 197a581211f..e87e54ee14f 100644
--- a/ghost/staff-service/lib/email-templates/recommendation-received.hbs
+++ b/ghost/staff-service/lib/email-templates/recommendation-received.hbs
@@ -33,14 +33,16 @@
                         {{/if}}
 
                         <!--[if !mso !vml]-->
-                        <figure style="margin:0 0 1.5em;padding:0;width:100%;">
-                          <a style="display:flex;min-height:110px;font-family:-apple-system,BlinkMacSystemFont,'Segoe UI',Roboto,Oxygen,Ubuntu,Cantarell,'Open Sans','Helvetica Neue',sans-serif;background:#F9F9FA;border-radius:3px;border:1px solid #F9F9FA;color:#15171a;text-decoration:none" href="{{recommendation.url}}">
+                        <figure style="margin:0 0 1.5em;padding:0;width:100%;background:#F9F9FA;">
+                          <a style="display:flex;font-family:-apple-system,BlinkMacSystemFont,'Segoe UI',Roboto,Oxygen,Ubuntu,Cantarell,'Open Sans','Helvetica Neue',sans-serif;background:#F9F9FA;border-radius:3px;border:1px solid #F9F9FA;color:#15171a;text-decoration:none" href="{{recommendation.url}}">
                             <div style="display:inline-block; width:100%; padding:20px">
                               <div style="color:#15212a;font-size:13px;font-weight:400">
                                 {{#if recommendation.favicon}}<img style="border:none;max-width:100%;margin-right:8px;margin-bottom:8px;width:20px;height:20px" src="{{recommendation.favicon}}" alt="">{{/if}}
                                 <div style="color:#15212a;font-size:16px;line-height:1.3em;font-weight:600">{{recommendation.title}}</div>
                               </div>
-                              <div class="kg-bookmark-description" style="display:-webkit-box;overflow-y:hidden;margin-top:6px;max-height:40px;color:#738a94;font-size:13px;line-height:1.5em;font-weight:400;-webkit-line-clamp: 2; -webkit-box-orient: vertical;">{{recommendation.excerpt}}</div>
+                              {{#if recommendation.excerpt}}
+                                <div class="kg-bookmark-description" style="display:-webkit-box;overflow-y:hidden;margin-top:6px;max-height:40px;color:#738a94;font-size:13px;line-height:1.5em;font-weight:400;-webkit-line-clamp: 2; -webkit-box-orient: vertical;">{{recommendation.excerpt}}</div>
+                              {{/if}}
                             </div>
                             {{#if recommendation.featuredImage}}
                               <div style="min-width: 140px; max-width: 180px; background-repeat: no-repeat; background-size: cover; background-position: center; border-radius: 0 2px 2px 0;background-image: url('{{recommendation.featuredImage}}')" class="new-mention-thumbnail">
@@ -52,26 +54,30 @@
                         <!--[endif]-->
 
                         <!--[if vml]>
-                        <table style="border-collapse: collapse; border-spacing: 0; margin: 0; padding: 0; width: 100%; border: 1px solid #f9f9fa; background: #f9f9fa; font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen, Ubuntu, Cantarell, "Open Sans", "Helvetica Neue", sans-serif;">
+                        <table style="border-collapse: collapse; border-spacing: 0; margin: 0; padding: 0; width: 100%; border: 1px solid #F9F9FA; font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen, Ubuntu, Cantarell, "Open Sans", "Helvetica Neue", sans-serif; background-color:#F9F9FA;" class="recommendation-card--outlook">
                             <tr>
                                 <td width="100%" style="padding: 20px;background-color:#F9F9FA;">
                                     <table style="margin: 0; padding: 0; border-collapse: collapse; border-spacing: 0;">
                                         <tr>
-                                            <td style="padding-bottom: 12px;">
+                                            <td>
                                               <table style="margin: 0; padding: 0; border-collapse: collapse; border-spacing: 0;">
+                                                  {{#if recommendation.favicon}}
+                                                    <tr>
+                                                        <td valign="middle" style="padding-bottom: 8px; font-size: 0; line-height: 1.5em">
+                                                            <a href="{{recommendation.url}}" style="color: #15212A; text-decoration: none;"><img src="{{recommendation.favicon}}" width="20" height="20" alt=" "></a>
+                                                        </td>
+                                                    </tr>
+                                                  {{/if}}
                                                   <tr>
-                                                      {{#if sourceFavicon}}
-                                                          <td valign="middle" style="padding-right: 8px; font-size: 0; line-height: 1.5em">
-                                                              <a href="{{sourceUrl}}" style="color: #15212A; text-decoration: none;"><img src="{{sourceFavicon}}" width="20" height="20" alt=" "></a>
-                                                          </td>
-                                                      {{/if}}
-                                                      <td><a style="color: #15212A; font-size: 15px; line-height: 1.5em; font-weight: 600; text-decoration: none;" href="{{sourceUrl}}">{{sourceTitle}}</a></td>
+                                                      <td><a style="color: #15212A; font-size: 15px; line-height: 1.5em; font-weight: 600; text-decoration: none;" href="{{recommendation.url}}">{{recommendation.title}}</a></td>
                                                   </tr>
                                               </table>
                                             </td>
                                         </tr>
                                         <tr>
-                                            <td><div><a href="{{sourceUrl}}" style="margin-top: 12px; color: #738a94; font-size: 13px; line-height: 1.5em; font-weight: 400;text-decoration: none;">{{sourceExcerpt}}</a></div></td>
+                                          {{#if recommendation.excerpt}}
+                                            <td style="padding-top: 12px;"><div><a href="{{recommendation.url}}" style="color: #738a94; font-size: 13px; line-height: 1.5em; font-weight: 400;text-decoration: none;">{{recommendation.excerpt}}</a></div></td>
+                                          {{/if}}
                                         </tr>
                                     </table>
                                 </td>
diff --git a/ghost/stats-service/package.json b/ghost/stats-service/package.json
index 49a98b61860..a5b92ac2446 100644
--- a/ghost/stats-service/package.json
+++ b/ghost/stats-service/package.json
@@ -20,12 +20,12 @@
     "lib"
   ],
   "devDependencies": {
-    "@types/luxon": "3.3.2",
+    "@types/luxon": "3.3.4",
     "@types/mocha": "10.0.1",
     "@types/sinon": "10.0.16",
     "c8": "8.0.1",
     "knex": "2.4.2",
-    "luxon": "3.4.3",
+    "luxon": "3.4.4",
     "mocha": "10.2.0",
     "should": "13.2.3",
     "sinon": "15.2.0",
diff --git a/ghost/stripe/package.json b/ghost/stripe/package.json
index 2bd462ff1a2..48dce587e23 100644
--- a/ghost/stripe/package.json
+++ b/ghost/stripe/package.json
@@ -25,7 +25,7 @@
     "sinon": "15.2.0"
   },
   "dependencies": {
-    "@tryghost/debug": "0.1.24",
+    "@tryghost/debug": "0.1.26",
     "@tryghost/domain-events": "0.0.0",
     "@tryghost/errors": "1.2.26",
     "@tryghost/logging": "2.4.8",
diff --git a/ghost/tiers/package.json b/ghost/tiers/package.json
index 193a78cc9a1..c53aaf50806 100644
--- a/ghost/tiers/package.json
+++ b/ghost/tiers/package.json
@@ -23,8 +23,8 @@
   },
   "dependencies": {
     "@tryghost/errors": "1.2.26",
-    "@tryghost/string": "0.2.4",
-    "@tryghost/tpl": "0.1.24",
+    "@tryghost/string": "0.2.10",
+    "@tryghost/tpl": "0.1.26",
     "bson-objectid": "2.0.4"
   }
 }
diff --git a/ghost/update-check-service/package.json b/ghost/update-check-service/package.json
index feb5eeadfb4..274870a3b96 100644
--- a/ghost/update-check-service/package.json
+++ b/ghost/update-check-service/package.json
@@ -25,10 +25,10 @@
     "uuid": "9.0.1"
   },
   "dependencies": {
-    "@tryghost/debug": "0.1.24",
+    "@tryghost/debug": "0.1.26",
     "@tryghost/errors": "1.2.26",
     "@tryghost/logging": "2.4.8",
-    "@tryghost/tpl": "0.1.24",
+    "@tryghost/tpl": "0.1.26",
     "lodash": "4.17.21",
     "moment": "2.24.0"
   }
diff --git a/package.json b/package.json
index 1c1a47103bd..a4cecb6f9e6 100644
--- a/package.json
+++ b/package.json
@@ -61,7 +61,8 @@
       "validator",
       "codemirror",
       "faker",
-      "ember-cli-code-coverage"
+      "ember-cli-code-coverage",
+      "ember-cli-terser"
     ],
     "ignorePaths": [
       "test",
diff --git a/yarn.lock b/yarn.lock
index 8a03d4ae20e..00c170566bf 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -165,51 +165,54 @@
     "@aws-sdk/types" "3.193.0"
     tslib "^2.3.1"
 
-"@aws-sdk/client-lambda@^3.363.0":
-  version "3.398.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/client-lambda/-/client-lambda-3.398.0.tgz#a899b9a8dedfb6c51478ae136e1cf16d5a65ec48"
-  integrity sha512-f++i62vpdh/kUFBx2hWnAJRpb1IOGSqP6+2OP4c7WCpYrrGKleZCRPEZdsDTYnEG1ws987XYfDtal4CVVVL+nw==
+"@aws-sdk/client-lambda@^3.405.0":
+  version "3.438.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/client-lambda/-/client-lambda-3.438.0.tgz#2f4471cb2c42ed1202f717bbf9de700f6d81b66f"
+  integrity sha512-FiWjoOabqJcJFHUJBZMzrL1IuvPNNrBnhVJknKo7SGiPtz8xeKZJ4VeJcClQjqGzuEbQCtqp/Ki5F7/EK3qv+w==
   dependencies:
     "@aws-crypto/sha256-browser" "3.0.0"
     "@aws-crypto/sha256-js" "3.0.0"
-    "@aws-sdk/client-sts" "3.398.0"
-    "@aws-sdk/credential-provider-node" "3.398.0"
-    "@aws-sdk/middleware-host-header" "3.398.0"
-    "@aws-sdk/middleware-logger" "3.398.0"
-    "@aws-sdk/middleware-recursion-detection" "3.398.0"
-    "@aws-sdk/middleware-signing" "3.398.0"
-    "@aws-sdk/middleware-user-agent" "3.398.0"
-    "@aws-sdk/types" "3.398.0"
-    "@aws-sdk/util-endpoints" "3.398.0"
-    "@aws-sdk/util-user-agent-browser" "3.398.0"
-    "@aws-sdk/util-user-agent-node" "3.398.0"
-    "@smithy/config-resolver" "^2.0.5"
-    "@smithy/eventstream-serde-browser" "^2.0.5"
-    "@smithy/eventstream-serde-config-resolver" "^2.0.5"
-    "@smithy/eventstream-serde-node" "^2.0.5"
-    "@smithy/fetch-http-handler" "^2.0.5"
-    "@smithy/hash-node" "^2.0.5"
-    "@smithy/invalid-dependency" "^2.0.5"
-    "@smithy/middleware-content-length" "^2.0.5"
-    "@smithy/middleware-endpoint" "^2.0.5"
-    "@smithy/middleware-retry" "^2.0.5"
-    "@smithy/middleware-serde" "^2.0.5"
-    "@smithy/middleware-stack" "^2.0.0"
-    "@smithy/node-config-provider" "^2.0.5"
-    "@smithy/node-http-handler" "^2.0.5"
-    "@smithy/protocol-http" "^2.0.5"
-    "@smithy/smithy-client" "^2.0.5"
-    "@smithy/types" "^2.2.2"
-    "@smithy/url-parser" "^2.0.5"
+    "@aws-sdk/client-sts" "3.438.0"
+    "@aws-sdk/core" "3.436.0"
+    "@aws-sdk/credential-provider-node" "3.438.0"
+    "@aws-sdk/middleware-host-header" "3.433.0"
+    "@aws-sdk/middleware-logger" "3.433.0"
+    "@aws-sdk/middleware-recursion-detection" "3.433.0"
+    "@aws-sdk/middleware-signing" "3.433.0"
+    "@aws-sdk/middleware-user-agent" "3.438.0"
+    "@aws-sdk/region-config-resolver" "3.433.0"
+    "@aws-sdk/types" "3.433.0"
+    "@aws-sdk/util-endpoints" "3.438.0"
+    "@aws-sdk/util-user-agent-browser" "3.433.0"
+    "@aws-sdk/util-user-agent-node" "3.437.0"
+    "@smithy/config-resolver" "^2.0.16"
+    "@smithy/eventstream-serde-browser" "^2.0.12"
+    "@smithy/eventstream-serde-config-resolver" "^2.0.12"
+    "@smithy/eventstream-serde-node" "^2.0.12"
+    "@smithy/fetch-http-handler" "^2.2.4"
+    "@smithy/hash-node" "^2.0.12"
+    "@smithy/invalid-dependency" "^2.0.12"
+    "@smithy/middleware-content-length" "^2.0.14"
+    "@smithy/middleware-endpoint" "^2.1.3"
+    "@smithy/middleware-retry" "^2.0.18"
+    "@smithy/middleware-serde" "^2.0.12"
+    "@smithy/middleware-stack" "^2.0.6"
+    "@smithy/node-config-provider" "^2.1.3"
+    "@smithy/node-http-handler" "^2.1.8"
+    "@smithy/protocol-http" "^3.0.8"
+    "@smithy/smithy-client" "^2.1.12"
+    "@smithy/types" "^2.4.0"
+    "@smithy/url-parser" "^2.0.12"
     "@smithy/util-base64" "^2.0.0"
     "@smithy/util-body-length-browser" "^2.0.0"
     "@smithy/util-body-length-node" "^2.1.0"
-    "@smithy/util-defaults-mode-browser" "^2.0.5"
-    "@smithy/util-defaults-mode-node" "^2.0.5"
-    "@smithy/util-retry" "^2.0.0"
-    "@smithy/util-stream" "^2.0.5"
+    "@smithy/util-defaults-mode-browser" "^2.0.16"
+    "@smithy/util-defaults-mode-node" "^2.0.21"
+    "@smithy/util-endpoints" "^1.0.2"
+    "@smithy/util-retry" "^2.0.5"
+    "@smithy/util-stream" "^2.0.17"
     "@smithy/util-utf8" "^2.0.0"
-    "@smithy/util-waiter" "^2.0.5"
+    "@smithy/util-waiter" "^2.0.12"
     tslib "^2.5.0"
 
 "@aws-sdk/client-ses@^3.31.0":
@@ -293,42 +296,45 @@
     "@aws-sdk/util-utf8-node" "3.188.0"
     tslib "^2.3.1"
 
-"@aws-sdk/client-sso@3.398.0":
-  version "3.398.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/client-sso/-/client-sso-3.398.0.tgz#68ce0a4d359794b629e5a7efe43a24ed9b52211e"
-  integrity sha512-CygL0jhfibw4kmWXG/3sfZMFNjcXo66XUuPC4BqZBk8Rj5vFoxp1vZeMkDLzTIk97Nvo5J5Bh+QnXKhub6AckQ==
+"@aws-sdk/client-sso@3.438.0":
+  version "3.438.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/client-sso/-/client-sso-3.438.0.tgz#2a48cc7f03c5858796053b09cd0b1480e067a5ce"
+  integrity sha512-L/xKq+K78PShLku8x5gM6lZDUp7LhFJ2ksKH7Vll+exSZq+QUaxuzjp4gqdzh6B0oIshv2jssQlUa0ScOmVRMg==
   dependencies:
     "@aws-crypto/sha256-browser" "3.0.0"
     "@aws-crypto/sha256-js" "3.0.0"
-    "@aws-sdk/middleware-host-header" "3.398.0"
-    "@aws-sdk/middleware-logger" "3.398.0"
-    "@aws-sdk/middleware-recursion-detection" "3.398.0"
-    "@aws-sdk/middleware-user-agent" "3.398.0"
-    "@aws-sdk/types" "3.398.0"
-    "@aws-sdk/util-endpoints" "3.398.0"
-    "@aws-sdk/util-user-agent-browser" "3.398.0"
-    "@aws-sdk/util-user-agent-node" "3.398.0"
-    "@smithy/config-resolver" "^2.0.5"
-    "@smithy/fetch-http-handler" "^2.0.5"
-    "@smithy/hash-node" "^2.0.5"
-    "@smithy/invalid-dependency" "^2.0.5"
-    "@smithy/middleware-content-length" "^2.0.5"
-    "@smithy/middleware-endpoint" "^2.0.5"
-    "@smithy/middleware-retry" "^2.0.5"
-    "@smithy/middleware-serde" "^2.0.5"
-    "@smithy/middleware-stack" "^2.0.0"
-    "@smithy/node-config-provider" "^2.0.5"
-    "@smithy/node-http-handler" "^2.0.5"
-    "@smithy/protocol-http" "^2.0.5"
-    "@smithy/smithy-client" "^2.0.5"
-    "@smithy/types" "^2.2.2"
-    "@smithy/url-parser" "^2.0.5"
+    "@aws-sdk/core" "3.436.0"
+    "@aws-sdk/middleware-host-header" "3.433.0"
+    "@aws-sdk/middleware-logger" "3.433.0"
+    "@aws-sdk/middleware-recursion-detection" "3.433.0"
+    "@aws-sdk/middleware-user-agent" "3.438.0"
+    "@aws-sdk/region-config-resolver" "3.433.0"
+    "@aws-sdk/types" "3.433.0"
+    "@aws-sdk/util-endpoints" "3.438.0"
+    "@aws-sdk/util-user-agent-browser" "3.433.0"
+    "@aws-sdk/util-user-agent-node" "3.437.0"
+    "@smithy/config-resolver" "^2.0.16"
+    "@smithy/fetch-http-handler" "^2.2.4"
+    "@smithy/hash-node" "^2.0.12"
+    "@smithy/invalid-dependency" "^2.0.12"
+    "@smithy/middleware-content-length" "^2.0.14"
+    "@smithy/middleware-endpoint" "^2.1.3"
+    "@smithy/middleware-retry" "^2.0.18"
+    "@smithy/middleware-serde" "^2.0.12"
+    "@smithy/middleware-stack" "^2.0.6"
+    "@smithy/node-config-provider" "^2.1.3"
+    "@smithy/node-http-handler" "^2.1.8"
+    "@smithy/protocol-http" "^3.0.8"
+    "@smithy/smithy-client" "^2.1.12"
+    "@smithy/types" "^2.4.0"
+    "@smithy/url-parser" "^2.0.12"
     "@smithy/util-base64" "^2.0.0"
     "@smithy/util-body-length-browser" "^2.0.0"
     "@smithy/util-body-length-node" "^2.1.0"
-    "@smithy/util-defaults-mode-browser" "^2.0.5"
-    "@smithy/util-defaults-mode-node" "^2.0.5"
-    "@smithy/util-retry" "^2.0.0"
+    "@smithy/util-defaults-mode-browser" "^2.0.16"
+    "@smithy/util-defaults-mode-node" "^2.0.21"
+    "@smithy/util-endpoints" "^1.0.2"
+    "@smithy/util-retry" "^2.0.5"
     "@smithy/util-utf8" "^2.0.0"
     tslib "^2.5.0"
 
@@ -375,45 +381,48 @@
     fast-xml-parser "4.0.11"
     tslib "^2.3.1"
 
-"@aws-sdk/client-sts@3.398.0":
-  version "3.398.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/client-sts/-/client-sts-3.398.0.tgz#8c569760d05b9fe663f82fc092d39b093096f7cc"
-  integrity sha512-/3Pa9wLMvBZipKraq3AtbmTfXW6q9kyvhwOno64f1Fz7kFb8ijQFMGoATS70B2pGEZTlxkUqJFWDiisT6Q6dFg==
+"@aws-sdk/client-sts@3.438.0":
+  version "3.438.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/client-sts/-/client-sts-3.438.0.tgz#d4a961d4a689035ca66cf2fd1f72ce89c6aca5c7"
+  integrity sha512-UBxLZKVVvbR4LHwSNSqaKx22YBSOGkavrh4SyDP8o8XOlXeRxTCllfSfjL9K5Mktp+ZwQ2NiubNcwmvUcGKbbg==
   dependencies:
     "@aws-crypto/sha256-browser" "3.0.0"
     "@aws-crypto/sha256-js" "3.0.0"
-    "@aws-sdk/credential-provider-node" "3.398.0"
-    "@aws-sdk/middleware-host-header" "3.398.0"
-    "@aws-sdk/middleware-logger" "3.398.0"
-    "@aws-sdk/middleware-recursion-detection" "3.398.0"
-    "@aws-sdk/middleware-sdk-sts" "3.398.0"
-    "@aws-sdk/middleware-signing" "3.398.0"
-    "@aws-sdk/middleware-user-agent" "3.398.0"
-    "@aws-sdk/types" "3.398.0"
-    "@aws-sdk/util-endpoints" "3.398.0"
-    "@aws-sdk/util-user-agent-browser" "3.398.0"
-    "@aws-sdk/util-user-agent-node" "3.398.0"
-    "@smithy/config-resolver" "^2.0.5"
-    "@smithy/fetch-http-handler" "^2.0.5"
-    "@smithy/hash-node" "^2.0.5"
-    "@smithy/invalid-dependency" "^2.0.5"
-    "@smithy/middleware-content-length" "^2.0.5"
-    "@smithy/middleware-endpoint" "^2.0.5"
-    "@smithy/middleware-retry" "^2.0.5"
-    "@smithy/middleware-serde" "^2.0.5"
-    "@smithy/middleware-stack" "^2.0.0"
-    "@smithy/node-config-provider" "^2.0.5"
-    "@smithy/node-http-handler" "^2.0.5"
-    "@smithy/protocol-http" "^2.0.5"
-    "@smithy/smithy-client" "^2.0.5"
-    "@smithy/types" "^2.2.2"
-    "@smithy/url-parser" "^2.0.5"
+    "@aws-sdk/core" "3.436.0"
+    "@aws-sdk/credential-provider-node" "3.438.0"
+    "@aws-sdk/middleware-host-header" "3.433.0"
+    "@aws-sdk/middleware-logger" "3.433.0"
+    "@aws-sdk/middleware-recursion-detection" "3.433.0"
+    "@aws-sdk/middleware-sdk-sts" "3.433.0"
+    "@aws-sdk/middleware-signing" "3.433.0"
+    "@aws-sdk/middleware-user-agent" "3.438.0"
+    "@aws-sdk/region-config-resolver" "3.433.0"
+    "@aws-sdk/types" "3.433.0"
+    "@aws-sdk/util-endpoints" "3.438.0"
+    "@aws-sdk/util-user-agent-browser" "3.433.0"
+    "@aws-sdk/util-user-agent-node" "3.437.0"
+    "@smithy/config-resolver" "^2.0.16"
+    "@smithy/fetch-http-handler" "^2.2.4"
+    "@smithy/hash-node" "^2.0.12"
+    "@smithy/invalid-dependency" "^2.0.12"
+    "@smithy/middleware-content-length" "^2.0.14"
+    "@smithy/middleware-endpoint" "^2.1.3"
+    "@smithy/middleware-retry" "^2.0.18"
+    "@smithy/middleware-serde" "^2.0.12"
+    "@smithy/middleware-stack" "^2.0.6"
+    "@smithy/node-config-provider" "^2.1.3"
+    "@smithy/node-http-handler" "^2.1.8"
+    "@smithy/protocol-http" "^3.0.8"
+    "@smithy/smithy-client" "^2.1.12"
+    "@smithy/types" "^2.4.0"
+    "@smithy/url-parser" "^2.0.12"
     "@smithy/util-base64" "^2.0.0"
     "@smithy/util-body-length-browser" "^2.0.0"
     "@smithy/util-body-length-node" "^2.1.0"
-    "@smithy/util-defaults-mode-browser" "^2.0.5"
-    "@smithy/util-defaults-mode-node" "^2.0.5"
-    "@smithy/util-retry" "^2.0.0"
+    "@smithy/util-defaults-mode-browser" "^2.0.16"
+    "@smithy/util-defaults-mode-node" "^2.0.21"
+    "@smithy/util-endpoints" "^1.0.2"
+    "@smithy/util-retry" "^2.0.5"
     "@smithy/util-utf8" "^2.0.0"
     fast-xml-parser "4.2.5"
     tslib "^2.5.0"
@@ -429,6 +438,13 @@
     "@aws-sdk/util-middleware" "3.193.0"
     tslib "^2.3.1"
 
+"@aws-sdk/core@3.436.0":
+  version "3.436.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/core/-/core-3.436.0.tgz#d85ecde9ac524a8f3cfe7e29b9e16942d7291723"
+  integrity sha512-vX5/LjXvCejC2XUY6TSg1oozjqK6BvkE75t0ys9dgqyr5PlZyZksMoeAFHUlj0sCjhT3ziWCujP1oiSpPWY9hg==
+  dependencies:
+    "@smithy/smithy-client" "^2.1.12"
+
 "@aws-sdk/credential-provider-env@3.193.0":
   version "3.193.0"
   resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-env/-/credential-provider-env-3.193.0.tgz#73fc7a24aa2c5af5c5d6cdd723892acc85eeba9d"
@@ -438,14 +454,14 @@
     "@aws-sdk/types" "3.193.0"
     tslib "^2.3.1"
 
-"@aws-sdk/credential-provider-env@3.398.0":
-  version "3.398.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-env/-/credential-provider-env-3.398.0.tgz#28d0d4d2de85dd35fdf83298191ea495da8f8646"
-  integrity sha512-Z8Yj5z7FroAsR6UVML+XUdlpoqEe9Dnle8c2h8/xWwIC2feTfIBhjLhRVxfbpbM1pLgBSNEcZ7U8fwq5l7ESVQ==
+"@aws-sdk/credential-provider-env@3.433.0":
+  version "3.433.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-env/-/credential-provider-env-3.433.0.tgz#7cceca1002ba2e79e10a9dfb119442bea7b88e7c"
+  integrity sha512-Vl7Qz5qYyxBurMn6hfSiNJeUHSqfVUlMt0C1Bds3tCkl3IzecRWwyBOlxtxO3VCrgVeW3HqswLzCvhAFzPH6nQ==
   dependencies:
-    "@aws-sdk/types" "3.398.0"
+    "@aws-sdk/types" "3.433.0"
     "@smithy/property-provider" "^2.0.0"
-    "@smithy/types" "^2.2.2"
+    "@smithy/types" "^2.4.0"
     tslib "^2.5.0"
 
 "@aws-sdk/credential-provider-imds@3.193.0":
@@ -473,20 +489,20 @@
     "@aws-sdk/types" "3.193.0"
     tslib "^2.3.1"
 
-"@aws-sdk/credential-provider-ini@3.398.0":
-  version "3.398.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.398.0.tgz#723264d8d8adb01963fdfe9fe9005aa20def3a56"
-  integrity sha512-AsK1lStK3nB9Cn6S6ODb1ktGh7SRejsNVQVKX3t5d3tgOaX+aX1Iwy8FzM/ZEN8uCloeRifUGIY9uQFygg5mSw==
+"@aws-sdk/credential-provider-ini@3.438.0":
+  version "3.438.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.438.0.tgz#845b09d2996e235d125a148aa8eca2f448d0d48e"
+  integrity sha512-WYPQR3pXoHJjn9/RMWipUhsUNFy6zhOiII6u8LJ5w84aNqIjV4+BdRYztRNGJD98jdtekhbkX0YKoSuZqP+unQ==
   dependencies:
-    "@aws-sdk/credential-provider-env" "3.398.0"
-    "@aws-sdk/credential-provider-process" "3.398.0"
-    "@aws-sdk/credential-provider-sso" "3.398.0"
-    "@aws-sdk/credential-provider-web-identity" "3.398.0"
-    "@aws-sdk/types" "3.398.0"
+    "@aws-sdk/credential-provider-env" "3.433.0"
+    "@aws-sdk/credential-provider-process" "3.433.0"
+    "@aws-sdk/credential-provider-sso" "3.438.0"
+    "@aws-sdk/credential-provider-web-identity" "3.433.0"
+    "@aws-sdk/types" "3.433.0"
     "@smithy/credential-provider-imds" "^2.0.0"
     "@smithy/property-provider" "^2.0.0"
-    "@smithy/shared-ini-file-loader" "^2.0.0"
-    "@smithy/types" "^2.2.2"
+    "@smithy/shared-ini-file-loader" "^2.0.6"
+    "@smithy/types" "^2.4.0"
     tslib "^2.5.0"
 
 "@aws-sdk/credential-provider-node@3.193.0":
@@ -505,21 +521,21 @@
     "@aws-sdk/types" "3.193.0"
     tslib "^2.3.1"
 
-"@aws-sdk/credential-provider-node@3.398.0":
-  version "3.398.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-node/-/credential-provider-node-3.398.0.tgz#afc6e6417b071a5a5b242329fd9c80aacba40f7d"
-  integrity sha512-odmI/DSKfuWUYeDnGTCEHBbC8/MwnF6yEq874zl6+owoVv0ZsYP8qBHfiJkYqrwg7wQ7Pi40sSAPC1rhesGwzg==
-  dependencies:
-    "@aws-sdk/credential-provider-env" "3.398.0"
-    "@aws-sdk/credential-provider-ini" "3.398.0"
-    "@aws-sdk/credential-provider-process" "3.398.0"
-    "@aws-sdk/credential-provider-sso" "3.398.0"
-    "@aws-sdk/credential-provider-web-identity" "3.398.0"
-    "@aws-sdk/types" "3.398.0"
+"@aws-sdk/credential-provider-node@3.438.0":
+  version "3.438.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-node/-/credential-provider-node-3.438.0.tgz#dfe72b8d580c70ed5b807741111be09dfe5aa5ae"
+  integrity sha512-uaw3D2R0svyrC32qyZ2aOv/l0AT9eClh+eQsZJTQD3Kz9q+2VdeOBThQ8fsMfRtm26nUbZo6A/CRwxkm6okI+w==
+  dependencies:
+    "@aws-sdk/credential-provider-env" "3.433.0"
+    "@aws-sdk/credential-provider-ini" "3.438.0"
+    "@aws-sdk/credential-provider-process" "3.433.0"
+    "@aws-sdk/credential-provider-sso" "3.438.0"
+    "@aws-sdk/credential-provider-web-identity" "3.433.0"
+    "@aws-sdk/types" "3.433.0"
     "@smithy/credential-provider-imds" "^2.0.0"
     "@smithy/property-provider" "^2.0.0"
-    "@smithy/shared-ini-file-loader" "^2.0.0"
-    "@smithy/types" "^2.2.2"
+    "@smithy/shared-ini-file-loader" "^2.0.6"
+    "@smithy/types" "^2.4.0"
     tslib "^2.5.0"
 
 "@aws-sdk/credential-provider-process@3.193.0":
@@ -532,15 +548,15 @@
     "@aws-sdk/types" "3.193.0"
     tslib "^2.3.1"
 
-"@aws-sdk/credential-provider-process@3.398.0":
-  version "3.398.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-process/-/credential-provider-process-3.398.0.tgz#bae46e14bcb664371d33926118bad61866184317"
-  integrity sha512-WrkBL1W7TXN508PA9wRXPFtzmGpVSW98gDaHEaa8GolAPHMPa5t2QcC/z/cFpglzrcVv8SA277zu9Z8tELdZhg==
+"@aws-sdk/credential-provider-process@3.433.0":
+  version "3.433.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-process/-/credential-provider-process-3.433.0.tgz#dd51c92480ed620e4c3f989852ee408ab1209d59"
+  integrity sha512-W7FcGlQjio9Y/PepcZGRyl5Bpwb0uWU7qIUCh+u4+q2mW4D5ZngXg8V/opL9/I/p4tUH9VXZLyLGwyBSkdhL+A==
   dependencies:
-    "@aws-sdk/types" "3.398.0"
+    "@aws-sdk/types" "3.433.0"
     "@smithy/property-provider" "^2.0.0"
-    "@smithy/shared-ini-file-loader" "^2.0.0"
-    "@smithy/types" "^2.2.2"
+    "@smithy/shared-ini-file-loader" "^2.0.6"
+    "@smithy/types" "^2.4.0"
     tslib "^2.5.0"
 
 "@aws-sdk/credential-provider-sso@3.193.0":
@@ -554,17 +570,17 @@
     "@aws-sdk/types" "3.193.0"
     tslib "^2.3.1"
 
-"@aws-sdk/credential-provider-sso@3.398.0":
-  version "3.398.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.398.0.tgz#b8a094e5e62cea233d77e27c8b7e2ce65e9f7559"
-  integrity sha512-2Dl35587xbnzR/GGZqA2MnFs8+kS4wbHQO9BioU0okA+8NRueohNMdrdQmQDdSNK4BfIpFspiZmFkXFNyEAfgw==
+"@aws-sdk/credential-provider-sso@3.438.0":
+  version "3.438.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.438.0.tgz#871062ae67f7f73e0b8725d3a84a27b6f3c9708d"
+  integrity sha512-Xykli/64xR18cBV5P0XFxcH120omtfAjC/cFy/9nFU/+dPvbk0uu1yEOZYteWHyGGkPN4PkHmbh60GiUCLQkWQ==
   dependencies:
-    "@aws-sdk/client-sso" "3.398.0"
-    "@aws-sdk/token-providers" "3.398.0"
-    "@aws-sdk/types" "3.398.0"
+    "@aws-sdk/client-sso" "3.438.0"
+    "@aws-sdk/token-providers" "3.438.0"
+    "@aws-sdk/types" "3.433.0"
     "@smithy/property-provider" "^2.0.0"
-    "@smithy/shared-ini-file-loader" "^2.0.0"
-    "@smithy/types" "^2.2.2"
+    "@smithy/shared-ini-file-loader" "^2.0.6"
+    "@smithy/types" "^2.4.0"
     tslib "^2.5.0"
 
 "@aws-sdk/credential-provider-web-identity@3.193.0":
@@ -576,14 +592,14 @@
     "@aws-sdk/types" "3.193.0"
     tslib "^2.3.1"
 
-"@aws-sdk/credential-provider-web-identity@3.398.0":
-  version "3.398.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.398.0.tgz#0396a34bf9d2e4b48530c2f899cbb4101b592db8"
-  integrity sha512-iG3905Alv9pINbQ8/MIsshgqYMbWx+NDQWpxbIW3W0MkSH3iAqdVpSCteYidYX9G/jv2Um1nW3y360ib20bvNg==
+"@aws-sdk/credential-provider-web-identity@3.433.0":
+  version "3.433.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.433.0.tgz#32403ba9cc47d3c46500f3c8e5e0041d20e4dbe8"
+  integrity sha512-RlwjP1I5wO+aPpwyCp23Mk8nmRbRL33hqRASy73c4JA2z2YiRua+ryt6MalIxehhwQU6xvXUKulJnPG9VaMFZg==
   dependencies:
-    "@aws-sdk/types" "3.398.0"
+    "@aws-sdk/types" "3.433.0"
     "@smithy/property-provider" "^2.0.0"
-    "@smithy/types" "^2.2.2"
+    "@smithy/types" "^2.4.0"
     tslib "^2.5.0"
 
 "@aws-sdk/fetch-http-handler@3.193.0":
@@ -653,14 +669,14 @@
     "@aws-sdk/types" "3.193.0"
     tslib "^2.3.1"
 
-"@aws-sdk/middleware-host-header@3.398.0":
-  version "3.398.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-host-header/-/middleware-host-header-3.398.0.tgz#4e5eeaa8ead96237e70cb6930dfb813a9c21ae8c"
-  integrity sha512-m+5laWdBaxIZK2ko0OwcCHJZJ5V1MgEIt8QVQ3k4/kOkN9ICjevOYmba751pHoTnbOYB7zQd6D2OT3EYEEsUcA==
+"@aws-sdk/middleware-host-header@3.433.0":
+  version "3.433.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-host-header/-/middleware-host-header-3.433.0.tgz#3b6687ee4021c2b56c96cff61b45a33fb762b1c7"
+  integrity sha512-mBTq3UWv1UzeHG+OfUQ2MB/5GEkt5LTKFaUqzL7ESwzW8XtpBgXnjZvIwu3Vcd3sEetMwijwaGiJhY0ae/YyaA==
   dependencies:
-    "@aws-sdk/types" "3.398.0"
-    "@smithy/protocol-http" "^2.0.5"
-    "@smithy/types" "^2.2.2"
+    "@aws-sdk/types" "3.433.0"
+    "@smithy/protocol-http" "^3.0.8"
+    "@smithy/types" "^2.4.0"
     tslib "^2.5.0"
 
 "@aws-sdk/middleware-logger@3.193.0":
@@ -671,13 +687,13 @@
     "@aws-sdk/types" "3.193.0"
     tslib "^2.3.1"
 
-"@aws-sdk/middleware-logger@3.398.0":
-  version "3.398.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-logger/-/middleware-logger-3.398.0.tgz#1f336c329861c2aa7cc267d84ef41e74e98b1502"
-  integrity sha512-CiJjW+FL12elS6Pn7/UVjVK8HWHhXMfvHZvOwx/Qkpy340sIhkuzOO6fZEruECDTZhl2Wqn81XdJ1ZQ4pRKpCg==
+"@aws-sdk/middleware-logger@3.433.0":
+  version "3.433.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-logger/-/middleware-logger-3.433.0.tgz#fcd4e31a8f134861cd519477b959c218a3600186"
+  integrity sha512-We346Fb5xGonTGVZC9Nvqtnqy74VJzYuTLLiuuftA5sbNzftBDy/22QCfvYSTOAl3bvif+dkDUzQY2ihc5PwOQ==
   dependencies:
-    "@aws-sdk/types" "3.398.0"
-    "@smithy/types" "^2.2.2"
+    "@aws-sdk/types" "3.433.0"
+    "@smithy/types" "^2.4.0"
     tslib "^2.5.0"
 
 "@aws-sdk/middleware-recursion-detection@3.193.0":
@@ -689,14 +705,14 @@
     "@aws-sdk/types" "3.193.0"
     tslib "^2.3.1"
 
-"@aws-sdk/middleware-recursion-detection@3.398.0":
-  version "3.398.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.398.0.tgz#e456d67fc88afac73004a8feae497d3ab24231e4"
-  integrity sha512-7QpOqPQAZNXDXv6vsRex4R8dLniL0E/80OPK4PPFsrCh9btEyhN9Begh4i1T+5lL28hmYkztLOkTQ2N5J3hgRQ==
+"@aws-sdk/middleware-recursion-detection@3.433.0":
+  version "3.433.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.433.0.tgz#5b4b7878ea46c70f507c9ea7c30ad0e5ee4ae6bf"
+  integrity sha512-HEvYC9PQlWY/ccUYtLvAlwwf1iCif2TSAmLNr3YTBRVa98x6jKL0hlCrHWYklFeqOGSKy6XhE+NGJMUII0/HaQ==
   dependencies:
-    "@aws-sdk/types" "3.398.0"
-    "@smithy/protocol-http" "^2.0.5"
-    "@smithy/types" "^2.2.2"
+    "@aws-sdk/types" "3.433.0"
+    "@smithy/protocol-http" "^3.0.8"
+    "@smithy/types" "^2.4.0"
     tslib "^2.5.0"
 
 "@aws-sdk/middleware-retry@3.193.0":
@@ -723,14 +739,14 @@
     "@aws-sdk/types" "3.193.0"
     tslib "^2.3.1"
 
-"@aws-sdk/middleware-sdk-sts@3.398.0":
-  version "3.398.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-sdk-sts/-/middleware-sdk-sts-3.398.0.tgz#f7383c86eedba80666b1a009256a1127d1c4edc6"
-  integrity sha512-+JH76XHEgfVihkY+GurohOQ5Z83zVN1nYcQzwCFnCDTh4dG4KwhnZKG+WPw6XJECocY0R+H0ivofeALHvVWJtQ==
+"@aws-sdk/middleware-sdk-sts@3.433.0":
+  version "3.433.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-sdk-sts/-/middleware-sdk-sts-3.433.0.tgz#9b30f17a922ecc5fd46b93f1edcd20d7146b814f"
+  integrity sha512-ORYbJnBejUyonFl5FwIqhvI3Cq6sAp9j+JpkKZtFNma9tFPdrhmYgfCeNH32H/wGTQV/tUoQ3luh0gA4cuk6DA==
   dependencies:
-    "@aws-sdk/middleware-signing" "3.398.0"
-    "@aws-sdk/types" "3.398.0"
-    "@smithy/types" "^2.2.2"
+    "@aws-sdk/middleware-signing" "3.433.0"
+    "@aws-sdk/types" "3.433.0"
+    "@smithy/types" "^2.4.0"
     tslib "^2.5.0"
 
 "@aws-sdk/middleware-serde@3.193.0":
@@ -753,17 +769,17 @@
     "@aws-sdk/util-middleware" "3.193.0"
     tslib "^2.3.1"
 
-"@aws-sdk/middleware-signing@3.398.0":
-  version "3.398.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-signing/-/middleware-signing-3.398.0.tgz#ad8f73c2e7ab564eea95568e2e109f41af6128ec"
-  integrity sha512-O0KqXAix1TcvZBFt1qoFkHMUNJOSgjJTYS7lFTRKSwgsD27bdW2TM2r9R8DAccWFt5Amjkdt+eOwQMIXPGTm8w==
+"@aws-sdk/middleware-signing@3.433.0":
+  version "3.433.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-signing/-/middleware-signing-3.433.0.tgz#670557ace5b97729dbabb6a991815e44eb0ef03b"
+  integrity sha512-jxPvt59NZo/epMNLNTu47ikmP8v0q217I6bQFGJG7JVFnfl36zDktMwGw+0xZR80qiK47/2BWrNpta61Zd2FxQ==
   dependencies:
-    "@aws-sdk/types" "3.398.0"
+    "@aws-sdk/types" "3.433.0"
     "@smithy/property-provider" "^2.0.0"
-    "@smithy/protocol-http" "^2.0.5"
+    "@smithy/protocol-http" "^3.0.8"
     "@smithy/signature-v4" "^2.0.0"
-    "@smithy/types" "^2.2.2"
-    "@smithy/util-middleware" "^2.0.0"
+    "@smithy/types" "^2.4.0"
+    "@smithy/util-middleware" "^2.0.5"
     tslib "^2.5.0"
 
 "@aws-sdk/middleware-stack@3.193.0":
@@ -782,15 +798,15 @@
     "@aws-sdk/types" "3.193.0"
     tslib "^2.3.1"
 
-"@aws-sdk/middleware-user-agent@3.398.0":
-  version "3.398.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.398.0.tgz#42542b3697ee6812cb8f81fd19757dc1592af0e0"
-  integrity sha512-nF1jg0L+18b5HvTcYzwyFgfZQQMELJINFqI0mi4yRKaX7T5a3aGp5RVLGGju/6tAGTuFbfBoEhkhU3kkxexPYQ==
+"@aws-sdk/middleware-user-agent@3.438.0":
+  version "3.438.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.438.0.tgz#a1165134d5b95e1fbeb841740084b3a43dead18a"
+  integrity sha512-a+xHT1wOxT6EA6YyLmrfaroKWOkwwyiktUfXKM0FsUutGzNi4fKhb5NZ2al58NsXzHgHFrasSDp+Lqbd/X2cEw==
   dependencies:
-    "@aws-sdk/types" "3.398.0"
-    "@aws-sdk/util-endpoints" "3.398.0"
-    "@smithy/protocol-http" "^2.0.5"
-    "@smithy/types" "^2.2.2"
+    "@aws-sdk/types" "3.433.0"
+    "@aws-sdk/util-endpoints" "3.438.0"
+    "@smithy/protocol-http" "^3.0.8"
+    "@smithy/types" "^2.4.0"
     tslib "^2.5.0"
 
 "@aws-sdk/node-config-provider@3.193.0":
@@ -847,6 +863,17 @@
     "@aws-sdk/types" "3.193.0"
     tslib "^2.3.1"
 
+"@aws-sdk/region-config-resolver@3.433.0":
+  version "3.433.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/region-config-resolver/-/region-config-resolver-3.433.0.tgz#37eb5f40db8af7ba9361aeb28c62b45421e780f0"
+  integrity sha512-xpjRjCZW+CDFdcMmmhIYg81ST5UAnJh61IHziQEk0FXONrg4kjyYPZAOjEdzXQ+HxJQuGQLKPhRdzxmQnbX7pg==
+  dependencies:
+    "@smithy/node-config-provider" "^2.1.3"
+    "@smithy/types" "^2.4.0"
+    "@smithy/util-config-provider" "^2.0.0"
+    "@smithy/util-middleware" "^2.0.5"
+    tslib "^2.5.0"
+
 "@aws-sdk/service-error-classification@3.193.0":
   version "3.193.0"
   resolved "https://registry.yarnpkg.com/@aws-sdk/service-error-classification/-/service-error-classification-3.193.0.tgz#35f1f5c8351f59d937b904ba5d7d144f65fb9e83"
@@ -881,44 +908,46 @@
     "@aws-sdk/types" "3.193.0"
     tslib "^2.3.1"
 
-"@aws-sdk/token-providers@3.398.0":
-  version "3.398.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/token-providers/-/token-providers-3.398.0.tgz#62fc8f5379df0e94486d71b96df975fb7e7d04cc"
-  integrity sha512-nrYgjzavGCKJL/48Vt0EL+OlIc5UZLfNGpgyUW9cv3XZwl+kXV0QB+HH0rHZZLfpbBgZ2RBIJR9uD5ieu/6hpQ==
+"@aws-sdk/token-providers@3.438.0":
+  version "3.438.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/token-providers/-/token-providers-3.438.0.tgz#e91baa37c9c78cb5b21cae96a12e7e1705c931d3"
+  integrity sha512-G2fUfTtU6/1ayYRMu0Pd9Ln4qYSvwJOWCqJMdkDgvXSwdgcOSOLsnAIk1AHGJDAvgLikdCzuyOsdJiexr9Vnww==
   dependencies:
     "@aws-crypto/sha256-browser" "3.0.0"
     "@aws-crypto/sha256-js" "3.0.0"
-    "@aws-sdk/middleware-host-header" "3.398.0"
-    "@aws-sdk/middleware-logger" "3.398.0"
-    "@aws-sdk/middleware-recursion-detection" "3.398.0"
-    "@aws-sdk/middleware-user-agent" "3.398.0"
-    "@aws-sdk/types" "3.398.0"
-    "@aws-sdk/util-endpoints" "3.398.0"
-    "@aws-sdk/util-user-agent-browser" "3.398.0"
-    "@aws-sdk/util-user-agent-node" "3.398.0"
-    "@smithy/config-resolver" "^2.0.5"
-    "@smithy/fetch-http-handler" "^2.0.5"
-    "@smithy/hash-node" "^2.0.5"
-    "@smithy/invalid-dependency" "^2.0.5"
-    "@smithy/middleware-content-length" "^2.0.5"
-    "@smithy/middleware-endpoint" "^2.0.5"
-    "@smithy/middleware-retry" "^2.0.5"
-    "@smithy/middleware-serde" "^2.0.5"
-    "@smithy/middleware-stack" "^2.0.0"
-    "@smithy/node-config-provider" "^2.0.5"
-    "@smithy/node-http-handler" "^2.0.5"
+    "@aws-sdk/middleware-host-header" "3.433.0"
+    "@aws-sdk/middleware-logger" "3.433.0"
+    "@aws-sdk/middleware-recursion-detection" "3.433.0"
+    "@aws-sdk/middleware-user-agent" "3.438.0"
+    "@aws-sdk/region-config-resolver" "3.433.0"
+    "@aws-sdk/types" "3.433.0"
+    "@aws-sdk/util-endpoints" "3.438.0"
+    "@aws-sdk/util-user-agent-browser" "3.433.0"
+    "@aws-sdk/util-user-agent-node" "3.437.0"
+    "@smithy/config-resolver" "^2.0.16"
+    "@smithy/fetch-http-handler" "^2.2.4"
+    "@smithy/hash-node" "^2.0.12"
+    "@smithy/invalid-dependency" "^2.0.12"
+    "@smithy/middleware-content-length" "^2.0.14"
+    "@smithy/middleware-endpoint" "^2.1.3"
+    "@smithy/middleware-retry" "^2.0.18"
+    "@smithy/middleware-serde" "^2.0.12"
+    "@smithy/middleware-stack" "^2.0.6"
+    "@smithy/node-config-provider" "^2.1.3"
+    "@smithy/node-http-handler" "^2.1.8"
     "@smithy/property-provider" "^2.0.0"
-    "@smithy/protocol-http" "^2.0.5"
-    "@smithy/shared-ini-file-loader" "^2.0.0"
-    "@smithy/smithy-client" "^2.0.5"
-    "@smithy/types" "^2.2.2"
-    "@smithy/url-parser" "^2.0.5"
+    "@smithy/protocol-http" "^3.0.8"
+    "@smithy/shared-ini-file-loader" "^2.0.6"
+    "@smithy/smithy-client" "^2.1.12"
+    "@smithy/types" "^2.4.0"
+    "@smithy/url-parser" "^2.0.12"
     "@smithy/util-base64" "^2.0.0"
     "@smithy/util-body-length-browser" "^2.0.0"
     "@smithy/util-body-length-node" "^2.1.0"
-    "@smithy/util-defaults-mode-browser" "^2.0.5"
-    "@smithy/util-defaults-mode-node" "^2.0.5"
-    "@smithy/util-retry" "^2.0.0"
+    "@smithy/util-defaults-mode-browser" "^2.0.16"
+    "@smithy/util-defaults-mode-node" "^2.0.21"
+    "@smithy/util-endpoints" "^1.0.2"
+    "@smithy/util-retry" "^2.0.5"
     "@smithy/util-utf8" "^2.0.0"
     tslib "^2.5.0"
 
@@ -927,12 +956,12 @@
   resolved "https://registry.yarnpkg.com/@aws-sdk/types/-/types-3.193.0.tgz#a2079ccda7312c7ba535b4379c97980141948fd9"
   integrity sha512-LV/wcPolRZKORrcHwkH59QMCkiDR5sM+9ZtuTxvyUGG2QFW/kjoxs08fUF10OWNJMrotBI+czDc5QJRgN8BlAw==
 
-"@aws-sdk/types@3.398.0", "@aws-sdk/types@^3.1.0", "@aws-sdk/types@^3.110.0", "@aws-sdk/types@^3.222.0":
-  version "3.398.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/types/-/types-3.398.0.tgz#8ce02559536670f9188cddfce32e9dd12b4fe965"
-  integrity sha512-r44fkS+vsEgKCuEuTV+TIk0t0m5ZlXHNjSDYEUvzLStbbfUFiNus/YG4UCa0wOk9R7VuQI67badsvvPeVPCGDQ==
+"@aws-sdk/types@3.433.0", "@aws-sdk/types@^3.1.0", "@aws-sdk/types@^3.110.0", "@aws-sdk/types@^3.222.0":
+  version "3.433.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/types/-/types-3.433.0.tgz#0f94eae2a4a3525ca872c9ab04e143c01806d755"
+  integrity sha512-0jEE2mSrNDd8VGFjTc1otYrwYPIkzZJEIK90ZxisKvQ/EURGBhNzWn7ejWB9XCMFT6XumYLBR0V9qq5UPisWtA==
   dependencies:
-    "@smithy/types" "^2.2.2"
+    "@smithy/types" "^2.4.0"
     tslib "^2.5.0"
 
 "@aws-sdk/url-parser@3.193.0":
@@ -1018,12 +1047,13 @@
     "@aws-sdk/types" "3.193.0"
     tslib "^2.3.1"
 
-"@aws-sdk/util-endpoints@3.398.0":
-  version "3.398.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/util-endpoints/-/util-endpoints-3.398.0.tgz#cb1cc5fe3e4b3839e4e1cc6a66f834cf0dde20ee"
-  integrity sha512-Fy0gLYAei/Rd6BrXG4baspCnWTUSd0NdokU1pZh4KlfEAEN1i8SPPgfiO5hLk7+2inqtCmqxVJlfqbMVe9k4bw==
+"@aws-sdk/util-endpoints@3.438.0":
+  version "3.438.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/util-endpoints/-/util-endpoints-3.438.0.tgz#fe79a0ad87fc201c8ecb422f6f040bd300c98df9"
+  integrity sha512-6VyPTq1kN3GWxwFt5DdZfOsr6cJZPLjWh0troY/0uUv3hK74C9o3Y0Xf/z8UAUvQFkVqZse12O0/BgPVMImvfA==
   dependencies:
-    "@aws-sdk/types" "3.398.0"
+    "@aws-sdk/types" "3.433.0"
+    "@smithy/util-endpoints" "^1.0.2"
     tslib "^2.5.0"
 
 "@aws-sdk/util-hex-encoding@3.188.0":
@@ -1063,13 +1093,13 @@
     bowser "^2.11.0"
     tslib "^2.3.1"
 
-"@aws-sdk/util-user-agent-browser@3.398.0":
-  version "3.398.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.398.0.tgz#5c3e430032eb867b7cbe48dda51a6d8c4ea000a8"
-  integrity sha512-A3Tzx1tkDHlBT+IgxmsMCHbV8LM7SwwCozq2ZjJRx0nqw3MCrrcxQFXldHeX/gdUMO+0Oocb7HGSnVODTq+0EA==
+"@aws-sdk/util-user-agent-browser@3.433.0":
+  version "3.433.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.433.0.tgz#b5ed0c0cca0db34a2c1c2ffc1b65e7cdd8dc88ff"
+  integrity sha512-2Cf/Lwvxbt5RXvWFXrFr49vXv0IddiUwrZoAiwhDYxvsh+BMnh+NUFot+ZQaTrk/8IPZVDeLPWZRdVy00iaVXQ==
   dependencies:
-    "@aws-sdk/types" "3.398.0"
-    "@smithy/types" "^2.2.2"
+    "@aws-sdk/types" "3.433.0"
+    "@smithy/types" "^2.4.0"
     bowser "^2.11.0"
     tslib "^2.5.0"
 
@@ -1082,14 +1112,14 @@
     "@aws-sdk/types" "3.193.0"
     tslib "^2.3.1"
 
-"@aws-sdk/util-user-agent-node@3.398.0":
-  version "3.398.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.398.0.tgz#1707737ee67c864d74a03137003b6d2b28172ee6"
-  integrity sha512-RTVQofdj961ej4//fEkppFf4KXqKGMTCqJYghx3G0C/MYXbg7MGl7LjfNGtJcboRE8pfHHQ/TUWBDA7RIAPPlQ==
+"@aws-sdk/util-user-agent-node@3.437.0":
+  version "3.437.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.437.0.tgz#f77729854ddf049ccaba8bae3d8fa279812b4716"
+  integrity sha512-JVEcvWaniamtYVPem4UthtCNoTBCfFTwYj7Y3CrWZ2Qic4TqrwLkAfaBGtI2TGrhIClVr77uzLI6exqMTN7orA==
   dependencies:
-    "@aws-sdk/types" "3.398.0"
-    "@smithy/node-config-provider" "^2.0.5"
-    "@smithy/types" "^2.2.2"
+    "@aws-sdk/types" "3.433.0"
+    "@smithy/node-config-provider" "^2.1.3"
+    "@smithy/types" "^2.4.0"
     tslib "^2.5.0"
 
 "@aws-sdk/util-utf8-browser@3.188.0", "@aws-sdk/util-utf8-browser@^3.0.0":
@@ -1136,22 +1166,22 @@
   resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.22.9.tgz#71cdb00a1ce3a329ce4cbec3a44f9fef35669730"
   integrity sha512-5UamI7xkUcJ3i9qVDS+KFDEK8/7oJ55/sJMB1Ge7IEapr7KfdfV/HErR+koZwOfd+SgtFKOKRhRakdg++DcJpQ==
 
-"@babel/core@^7.0.0", "@babel/core@^7.1.6", "@babel/core@^7.11.6", "@babel/core@^7.12.0", "@babel/core@^7.12.3", "@babel/core@^7.12.9", "@babel/core@^7.13.10", "@babel/core@^7.13.16", "@babel/core@^7.16.7", "@babel/core@^7.20.12", "@babel/core@^7.20.2", "@babel/core@^7.21.3", "@babel/core@^7.22.20", "@babel/core@^7.22.9", "@babel/core@^7.3.4", "@babel/core@^7.7.5":
-  version "7.22.20"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.22.20.tgz#e3d0eed84c049e2a2ae0a64d27b6a37edec385b7"
-  integrity sha512-Y6jd1ahLubuYweD/zJH+vvOY141v4f9igNQAQ+MBgq9JlHS2iTsZKn1aMsb3vGccZsXI16VzTBw52Xx0DWmtnA==
+"@babel/core@^7.0.0", "@babel/core@^7.1.6", "@babel/core@^7.11.6", "@babel/core@^7.12.0", "@babel/core@^7.12.3", "@babel/core@^7.12.9", "@babel/core@^7.13.10", "@babel/core@^7.13.16", "@babel/core@^7.16.7", "@babel/core@^7.20.12", "@babel/core@^7.20.2", "@babel/core@^7.21.3", "@babel/core@^7.22.9", "@babel/core@^7.23.2", "@babel/core@^7.3.4", "@babel/core@^7.7.5":
+  version "7.23.2"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.23.2.tgz#ed10df0d580fff67c5f3ee70fd22e2e4c90a9f94"
+  integrity sha512-n7s51eWdaWZ3vGT2tD4T7J6eJs3QoBXydv7vkUM06Bf1cbVD2Kc2UrkzhiQwobfV7NwOnQXYL7UBJ5VPU+RGoQ==
   dependencies:
     "@ampproject/remapping" "^2.2.0"
     "@babel/code-frame" "^7.22.13"
-    "@babel/generator" "^7.22.15"
+    "@babel/generator" "^7.23.0"
     "@babel/helper-compilation-targets" "^7.22.15"
-    "@babel/helper-module-transforms" "^7.22.20"
-    "@babel/helpers" "^7.22.15"
-    "@babel/parser" "^7.22.16"
+    "@babel/helper-module-transforms" "^7.23.0"
+    "@babel/helpers" "^7.23.2"
+    "@babel/parser" "^7.23.0"
     "@babel/template" "^7.22.15"
-    "@babel/traverse" "^7.22.20"
-    "@babel/types" "^7.22.19"
-    convert-source-map "^1.7.0"
+    "@babel/traverse" "^7.23.2"
+    "@babel/types" "^7.23.0"
+    convert-source-map "^2.0.0"
     debug "^4.1.0"
     gensync "^1.0.0-beta.2"
     json5 "^2.2.3"
@@ -1166,12 +1196,12 @@
     eslint-visitor-keys "^2.1.0"
     semver "^6.3.1"
 
-"@babel/generator@^7.12.11", "@babel/generator@^7.20.4", "@babel/generator@^7.22.15", "@babel/generator@^7.22.9", "@babel/generator@^7.7.2":
-  version "7.22.15"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.22.15.tgz#1564189c7ec94cb8f77b5e8a90c4d200d21b2339"
-  integrity sha512-Zu9oWARBqeVOW0dZOjXc3JObrzuqothQ3y/n1kUtrjCoCPLkXUwMvOo/F/TCfoHMbWIFlWwpZtkZVb9ga4U2pA==
+"@babel/generator@^7.12.11", "@babel/generator@^7.20.4", "@babel/generator@^7.22.9", "@babel/generator@^7.23.0", "@babel/generator@^7.7.2":
+  version "7.23.0"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.23.0.tgz#df5c386e2218be505b34837acbcb874d7a983420"
+  integrity sha512-lN85QRR+5IbYrMWM6Y4pE/noaQtg4pNiqeNGX60eqOfo6gtEj6uw/JagelB8vVztSd7R6M5n1+PQkDbHbBRU4g==
   dependencies:
-    "@babel/types" "^7.22.15"
+    "@babel/types" "^7.23.0"
     "@jridgewell/gen-mapping" "^0.3.2"
     "@jridgewell/trace-mapping" "^0.3.17"
     jsesc "^2.5.1"
@@ -1253,13 +1283,13 @@
   resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz#96159db61d34a29dba454c959f5ae4a649ba9167"
   integrity sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA==
 
-"@babel/helper-function-name@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.22.5.tgz#ede300828905bb15e582c037162f99d5183af1be"
-  integrity sha512-wtHSq6jMRE3uF2otvfuD3DIvVhOsSNshQl0Qrd7qC9oQJzHvOL4qQXlQn2916+CXGywIjpGuIkoyZRRxHPiNQQ==
+"@babel/helper-function-name@^7.22.5", "@babel/helper-function-name@^7.23.0":
+  version "7.23.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz#1f9a3cdbd5b2698a670c30d2735f9af95ed52759"
+  integrity sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw==
   dependencies:
-    "@babel/template" "^7.22.5"
-    "@babel/types" "^7.22.5"
+    "@babel/template" "^7.22.15"
+    "@babel/types" "^7.23.0"
 
 "@babel/helper-hoist-variables@^7.22.5":
   version "7.22.5"
@@ -1282,10 +1312,10 @@
   dependencies:
     "@babel/types" "^7.22.15"
 
-"@babel/helper-module-transforms@^7.22.20", "@babel/helper-module-transforms@^7.22.5":
-  version "7.22.20"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.22.20.tgz#da9edc14794babbe7386df438f3768067132f59e"
-  integrity sha512-dLT7JVWIUUxKOs1UnJUBR3S70YK+pKX6AbJgB2vMIvEkZkrfJDbYDJesnPshtKV4LhDOR3Oc5YULeDizRek+5A==
+"@babel/helper-module-transforms@^7.22.5", "@babel/helper-module-transforms@^7.23.0":
+  version "7.23.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.23.0.tgz#3ec246457f6c842c0aee62a01f60739906f7047e"
+  integrity sha512-WhDWw1tdrlT0gMgUJSlX0IQvoO1eN279zrAUbVB+KpV2c3Tylz8+GnKOLllCS6Z/iZQEyVYxhZVUdPTqs2YYPw==
   dependencies:
     "@babel/helper-environment-visitor" "^7.22.20"
     "@babel/helper-module-imports" "^7.22.15"
@@ -1368,14 +1398,14 @@
     "@babel/template" "^7.22.5"
     "@babel/types" "^7.22.5"
 
-"@babel/helpers@^7.22.15":
-  version "7.22.15"
-  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.22.15.tgz#f09c3df31e86e3ea0b7ff7556d85cdebd47ea6f1"
-  integrity sha512-7pAjK0aSdxOwR+CcYAqgWOGy5dcfvzsTIfFTb2odQqW47MDfv14UaJDY6eng8ylM2EaeKXdxaSWESbkmaQHTmw==
+"@babel/helpers@^7.23.2":
+  version "7.23.2"
+  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.23.2.tgz#2832549a6e37d484286e15ba36a5330483cac767"
+  integrity sha512-lzchcp8SjTSVe/fPmLwtWVBFC7+Tbn8LGHDVfDp9JGxpAY5opSaEFgt8UQvrnECWOTdji2mOWMz1rOhkHscmGQ==
   dependencies:
     "@babel/template" "^7.22.15"
-    "@babel/traverse" "^7.22.15"
-    "@babel/types" "^7.22.15"
+    "@babel/traverse" "^7.23.2"
+    "@babel/types" "^7.23.0"
 
 "@babel/highlight@^7.10.4", "@babel/highlight@^7.22.13":
   version "7.22.20"
@@ -1386,10 +1416,10 @@
     chalk "^2.4.2"
     js-tokens "^4.0.0"
 
-"@babel/parser@^7.1.0", "@babel/parser@^7.12.3", "@babel/parser@^7.13.16", "@babel/parser@^7.14.7", "@babel/parser@^7.20.7", "@babel/parser@^7.22.15", "@babel/parser@^7.22.16", "@babel/parser@^7.22.7", "@babel/parser@^7.4.5", "@babel/parser@^7.7.0":
-  version "7.22.16"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.22.16.tgz#180aead7f247305cce6551bea2720934e2fa2c95"
-  integrity sha512-+gPfKv8UWeKKeJTUxe59+OobVcrYHETCsORl61EmSkmgymguYk/X5bp7GuUIXaFsc6y++v8ZxPsLSSuujqDphA==
+"@babel/parser@^7.1.0", "@babel/parser@^7.12.3", "@babel/parser@^7.13.16", "@babel/parser@^7.14.7", "@babel/parser@^7.20.7", "@babel/parser@^7.22.15", "@babel/parser@^7.22.7", "@babel/parser@^7.23.0", "@babel/parser@^7.4.5", "@babel/parser@^7.7.0":
+  version "7.23.0"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.23.0.tgz#da950e622420bf96ca0d0f2909cdddac3acd8719"
+  integrity sha512-vvPKKdMemU85V9WE/l5wZEmImpCtLqbnTvqDS2U1fJ96KrxoW7KrXhNsNCblQlg8Ck4b85yxdTyelsMUgFUXiw==
 
 "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.22.5":
   version "7.22.5"
@@ -2247,7 +2277,7 @@
   dependencies:
     regenerator-runtime "^0.13.4"
 
-"@babel/runtime@^7.10.5", "@babel/runtime@^7.12.0", "@babel/runtime@^7.12.5", "@babel/runtime@^7.13.10", "@babel/runtime@^7.17.8", "@babel/runtime@^7.18.3", "@babel/runtime@^7.18.6", "@babel/runtime@^7.20.6", "@babel/runtime@^7.21.0", "@babel/runtime@^7.22.5", "@babel/runtime@^7.5.5", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7", "@babel/runtime@^7.9.2":
+"@babel/runtime@^7.10.5", "@babel/runtime@^7.12.0", "@babel/runtime@^7.12.5", "@babel/runtime@^7.13.10", "@babel/runtime@^7.17.8", "@babel/runtime@^7.18.3", "@babel/runtime@^7.18.6", "@babel/runtime@^7.20.6", "@babel/runtime@^7.21.0", "@babel/runtime@^7.23.2", "@babel/runtime@^7.5.5", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7", "@babel/runtime@^7.9.2":
   version "7.23.2"
   resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.23.2.tgz#062b0ac103261d68a966c4c7baf2ae3e62ec3885"
   integrity sha512-mM8eg4yl5D6i3lu2QKPuPH4FArvJ8KhTofbE7jwMUv9KX5mBvwPAqnV3MlyBNqdp9RyRKP6Yck8TrfYrPvX3bg==
@@ -2263,23 +2293,23 @@
     "@babel/parser" "^7.22.15"
     "@babel/types" "^7.22.15"
 
-"@babel/traverse@^7.1.6", "@babel/traverse@^7.12.1", "@babel/traverse@^7.20.1", "@babel/traverse@^7.22.15", "@babel/traverse@^7.22.20", "@babel/traverse@^7.22.8", "@babel/traverse@^7.4.5", "@babel/traverse@^7.7.0", "@babel/traverse@^7.7.2":
-  version "7.22.20"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.22.20.tgz#db572d9cb5c79e02d83e5618b82f6991c07584c9"
-  integrity sha512-eU260mPZbU7mZ0N+X10pxXhQFMGTeLb9eFS0mxehS8HZp9o1uSnFeWQuG1UPrlxgA7QoUzFhOnilHDp0AXCyHw==
+"@babel/traverse@^7.1.6", "@babel/traverse@^7.12.1", "@babel/traverse@^7.20.1", "@babel/traverse@^7.22.8", "@babel/traverse@^7.23.2", "@babel/traverse@^7.4.5", "@babel/traverse@^7.7.0", "@babel/traverse@^7.7.2":
+  version "7.23.2"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.23.2.tgz#329c7a06735e144a506bdb2cad0268b7f46f4ad8"
+  integrity sha512-azpe59SQ48qG6nu2CzcMLbxUudtN+dOM9kDbUqGq3HXUJRlo7i8fvPoxQUzYgLZ4cMVmuZgm8vvBpNeRhd6XSw==
   dependencies:
     "@babel/code-frame" "^7.22.13"
-    "@babel/generator" "^7.22.15"
+    "@babel/generator" "^7.23.0"
     "@babel/helper-environment-visitor" "^7.22.20"
-    "@babel/helper-function-name" "^7.22.5"
+    "@babel/helper-function-name" "^7.23.0"
     "@babel/helper-hoist-variables" "^7.22.5"
     "@babel/helper-split-export-declaration" "^7.22.6"
-    "@babel/parser" "^7.22.16"
-    "@babel/types" "^7.22.19"
+    "@babel/parser" "^7.23.0"
+    "@babel/types" "^7.23.0"
     debug "^4.1.0"
     globals "^11.1.0"
 
-"@babel/types@^7.0.0", "@babel/types@^7.1.6", "@babel/types@^7.12.1", "@babel/types@^7.12.13", "@babel/types@^7.2.0", "@babel/types@^7.20.2", "@babel/types@^7.20.7", "@babel/types@^7.21.3", "@babel/types@^7.21.5", "@babel/types@^7.22.10", "@babel/types@^7.22.15", "@babel/types@^7.22.19", "@babel/types@^7.22.5", "@babel/types@^7.23.0", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4", "@babel/types@^7.7.0", "@babel/types@^7.7.2":
+"@babel/types@^7.0.0", "@babel/types@^7.1.6", "@babel/types@^7.12.1", "@babel/types@^7.12.13", "@babel/types@^7.2.0", "@babel/types@^7.20.2", "@babel/types@^7.20.7", "@babel/types@^7.21.3", "@babel/types@^7.21.5", "@babel/types@^7.22.10", "@babel/types@^7.22.15", "@babel/types@^7.22.5", "@babel/types@^7.23.0", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4", "@babel/types@^7.7.0", "@babel/types@^7.7.2":
   version "7.23.0"
   resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.23.0.tgz#8c1f020c9df0e737e4e247c0619f58c68458aaeb"
   integrity sha512-0oIyUfKoI3mSqMvsxBdclDwxXKXAUA8v/apZbc+iSyARYou1o8ZGDxbUYyLFoW2arqS2jDGqJuZvv1d/io1axg==
@@ -2849,6 +2879,13 @@
   dependencies:
     ember-cli-babel "^7.4.0"
 
+"@ember/string@^3.0.0":
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/@ember/string/-/string-3.1.1.tgz#0a5ac0d1e4925259e41d5c8d55ef616117d47ff0"
+  integrity sha512-UbXJ+k3QOrYN4SRPHgXCqYIJ+yWWUg1+vr0H4DhdQPTy8LJfyqwZ2tc5uqpSSnEXE+/1KopHBE5J8GDagAg5cg==
+  dependencies:
+    ember-cli-babel "^7.26.6"
+
 "@ember/test-helpers@2.9.4":
   version "2.9.4"
   resolved "https://registry.yarnpkg.com/@ember/test-helpers/-/test-helpers-2.9.4.tgz#985022e9ba05cfc918bcf08b77cbb355f85b723e"
@@ -4178,10 +4215,10 @@
     "@types/mdx" "^2.0.0"
     "@types/react" ">=16"
 
-"@metascraper/helpers@^5.37.1":
-  version "5.37.1"
-  resolved "https://registry.yarnpkg.com/@metascraper/helpers/-/helpers-5.37.1.tgz#3defcae31600e62abfcd4a1d60a7cbe83dc95877"
-  integrity sha512-gVq+5aqiAucL/TXwn94uuPlq4/VhjduReltlUVRkb90+Tp/Xb39X06QuHTcN0Ahp/5STjUdDBbp1VOCX+16oZg==
+"@metascraper/helpers@^5.38.0":
+  version "5.38.0"
+  resolved "https://registry.yarnpkg.com/@metascraper/helpers/-/helpers-5.38.0.tgz#d27f4aced187abace6f330b7b106cccb4d06419f"
+  integrity sha512-z7vhAfFUpFagakdDE8ZwJmLb7AevYo/qNx0YMsoBS1C1Nf9hmfq5jCtHQHc34EZF2gZbFKyihVQe5V4hC4G3AA==
   dependencies:
     audio-extensions "0.0.0"
     chrono-node "~2.6.4"
@@ -4239,13 +4276,13 @@
     nan "^2.17.0"
     semver "^7.5.2"
 
-"@newrelic/security-agent@0.3.0":
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/@newrelic/security-agent/-/security-agent-0.3.0.tgz#95c171b80779c48a2deec8e158e9b3e8eae275fa"
-  integrity sha512-HdaznRDgUNmTvemuFoFzmv25BI/CMjjFWptMhC5E5PV1HiYJzGnFN0acMKabvqOu+3H0QuDFoKehxqA/4w/xsg==
+"@newrelic/security-agent@0.4.0":
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/@newrelic/security-agent/-/security-agent-0.4.0.tgz#584eb57c416a2062e02afac4e8bf6a37685e3419"
+  integrity sha512-NWwKf1yBKOscdASGLsO3U7op8cH3k+WrGrge6Q8BY2bR/LWn4HJ6kLLIWwrUso77mYDWHtgxG0YteUCIRvUOlQ==
   dependencies:
-    "@aws-sdk/client-lambda" "^3.363.0"
-    axios "0.21.4"
+    "@aws-sdk/client-lambda" "^3.405.0"
+    axios "1.6.0"
     check-disk-space "3.3.1"
     content-type "^1.0.5"
     fast-safe-stringify "^2.1.1"
@@ -4264,7 +4301,7 @@
     sync-request "^6.1.0"
     unescape "^1.0.1"
     unescape-js "^1.1.4"
-    uuid "^9.0.0"
+    uuid "^9.0.1"
     ws "^7.5.9"
 
 "@newrelic/superagent@^7.0.1":
@@ -4819,180 +4856,107 @@
     domhandler "^4.2.0"
     selderee "^0.6.0"
 
-"@sentry-internal/tracing@7.70.0":
-  version "7.70.0"
-  resolved "https://registry.yarnpkg.com/@sentry-internal/tracing/-/tracing-7.70.0.tgz#00fd30426a6d4737385004434a39cf60736beafc"
-  integrity sha512-SpbE6wZhs6QwG2ORWCt8r28o1T949qkWx/KeRTCdK4Ub95PQ3Y3DgnqD8Wz//3q50Wt6EZDEibmz4t067g6PPg==
-  dependencies:
-    "@sentry/core" "7.70.0"
-    "@sentry/types" "7.70.0"
-    "@sentry/utils" "7.70.0"
-    tslib "^2.4.1 || ^1.9.3"
-
-"@sentry-internal/tracing@7.73.0":
-  version "7.73.0"
-  resolved "https://registry.yarnpkg.com/@sentry-internal/tracing/-/tracing-7.73.0.tgz#4838f31e41d23a6041ef4520519b80f788bf1cac"
-  integrity sha512-ig3WL/Nqp8nRQ52P205NaypGKNfIl/G+cIqge9xPW6zfRb5kJdM1YParw9GSJ1SPjEZBkBORGAML0on5H2FILw==
-  dependencies:
-    "@sentry/core" "7.73.0"
-    "@sentry/types" "7.73.0"
-    "@sentry/utils" "7.73.0"
-    tslib "^2.4.1 || ^1.9.3"
-
-"@sentry/browser@7.70.0":
-  version "7.70.0"
-  resolved "https://registry.yarnpkg.com/@sentry/browser/-/browser-7.70.0.tgz#e284999843bebc5bccd2c7b247f01aa048518f5c"
-  integrity sha512-PB+IP49/TLcnDHCj9eJ5tcHE0pzXg23wBakmF3KGMSd5nxEbUvmOsaFPZcgUUlL9JlU3v1Y40We7HdPStrY6oA==
-  dependencies:
-    "@sentry-internal/tracing" "7.70.0"
-    "@sentry/core" "7.70.0"
-    "@sentry/replay" "7.70.0"
-    "@sentry/types" "7.70.0"
-    "@sentry/utils" "7.70.0"
-    tslib "^2.4.1 || ^1.9.3"
-
-"@sentry/core@7.70.0":
-  version "7.70.0"
-  resolved "https://registry.yarnpkg.com/@sentry/core/-/core-7.70.0.tgz#c481ef27cf05293fb681ee4ff4d4b0b1e8664bb5"
-  integrity sha512-voUsGVM+jwRp99AQYFnRvr7sVd2tUhIMj1L6F42LtD3vp7t5ZnKp3NpXagtFW2vWzXESfyJUBhM0qI/bFvn7ZA==
-  dependencies:
-    "@sentry/types" "7.70.0"
-    "@sentry/utils" "7.70.0"
-    tslib "^2.4.1 || ^1.9.3"
-
-"@sentry/core@7.73.0":
-  version "7.73.0"
-  resolved "https://registry.yarnpkg.com/@sentry/core/-/core-7.73.0.tgz#1caeeec44f42c4d58c06cc05dec39e5497b65aa3"
-  integrity sha512-9FEz4Gq848LOgVN2OxJGYuQqxv7cIVw69VlAzWHEm3njt8mjvlTq+7UiFsGRo84+59V2FQuHxzA7vVjl90WfSg==
-  dependencies:
-    "@sentry/types" "7.73.0"
-    "@sentry/utils" "7.73.0"
-    tslib "^2.4.1 || ^1.9.3"
-
-"@sentry/core@7.75.1":
-  version "7.75.1"
-  resolved "https://registry.yarnpkg.com/@sentry/core/-/core-7.75.1.tgz#f48cc424990ee4f31541e93f2c0277bfd5be9ed3"
-  integrity sha512-Kw4KyKBxbxbh8OKO0S11Tm0gWP+6AaXXYrsq3hp8H338l/wOmIzyckmCbUrc/XJeoRqaFLJbdcCrcUEDZUvsVQ==
-  dependencies:
-    "@sentry/types" "7.75.1"
-    "@sentry/utils" "7.75.1"
-
-"@sentry/ember@7.70.0":
-  version "7.70.0"
-  resolved "https://registry.yarnpkg.com/@sentry/ember/-/ember-7.70.0.tgz#8f0d6c197384e1932278f76313175a84447eea3c"
-  integrity sha512-SVyOc0vk7+7sT/wPvvg0gaAQrC/87zAl/7QW2u3RRK5yyDRNX2WWzJJdwtapdzJCJhT2HNwpgEPp5IRW/tPY8g==
+"@sentry-internal/tracing@7.78.0":
+  version "7.78.0"
+  resolved "https://registry.yarnpkg.com/@sentry-internal/tracing/-/tracing-7.78.0.tgz#254d29a9434ee1de41201620b172a8cc56387e72"
+  integrity sha512-53wf+HWyjiansZ0U+q7Q7U2kEjXfL/C8+XOwE4ntLVPGFyvxuYaRUb8OEYFNTsODf20ihnxOLZ+GsXXPlqPfFA==
+  dependencies:
+    "@sentry/core" "7.78.0"
+    "@sentry/types" "7.78.0"
+    "@sentry/utils" "7.78.0"
+
+"@sentry/browser@7.78.0":
+  version "7.78.0"
+  resolved "https://registry.yarnpkg.com/@sentry/browser/-/browser-7.78.0.tgz#02a8a142814cb914c6199cabd965e951fd0c5deb"
+  integrity sha512-KVeC71y7hnqYN3HN6KZH33y0yBAE8CmiApQ08KFIF3+6Ty1V3PC1mbQAmNGttka57jNvyBXTCpN8Fw8MPK9V/A==
+  dependencies:
+    "@sentry-internal/tracing" "7.78.0"
+    "@sentry/core" "7.78.0"
+    "@sentry/replay" "7.78.0"
+    "@sentry/types" "7.78.0"
+    "@sentry/utils" "7.78.0"
+
+"@sentry/core@7.78.0":
+  version "7.78.0"
+  resolved "https://registry.yarnpkg.com/@sentry/core/-/core-7.78.0.tgz#0c306f258e12637508b14e0633a4a5506628e914"
+  integrity sha512-cf8U+1cNkIK14KC5ySXtzu4RW5Veto3lqkS95Rbl4ExUsrVsfansFNH63j6Bvu7UbJlBRK67uf6Ug2GBbUBUIg==
+  dependencies:
+    "@sentry/types" "7.78.0"
+    "@sentry/utils" "7.78.0"
+
+"@sentry/ember@7.78.0":
+  version "7.78.0"
+  resolved "https://registry.yarnpkg.com/@sentry/ember/-/ember-7.78.0.tgz#4c17d9e719611f681abce3f091aa6fa45508d0e1"
+  integrity sha512-STuOtev8UP9vapweCY08zrF0BIoNdpYNhFCInb4nV/UwZg/pNhbC3Pk+gPXEKzDt6RnydAGXSYjtyb1XaXA4tA==
   dependencies:
     "@embroider/macros" "^1.9.0"
-    "@sentry/browser" "7.70.0"
-    "@sentry/types" "7.70.0"
-    "@sentry/utils" "7.70.0"
+    "@sentry/browser" "7.78.0"
+    "@sentry/types" "7.78.0"
+    "@sentry/utils" "7.78.0"
     ember-auto-import "^1.12.1 || ^2.4.3"
     ember-cli-babel "^7.26.11"
     ember-cli-htmlbars "^6.1.1"
     ember-cli-typescript "^5.1.1"
 
 "@sentry/integrations@^7.75.1":
-  version "7.75.1"
-  resolved "https://registry.yarnpkg.com/@sentry/integrations/-/integrations-7.75.1.tgz#bfe83ce25606a5b47cb585dd51feef81fc86e00d"
-  integrity sha512-qSCyTNX3DiL1aYRmdq10LRhPLfh1KJYKhbmGszC1PII4mt9FbLVmC8fSXiDbhgiuSUKKrDE+J2lC//w688lvHw==
+  version "7.78.0"
+  resolved "https://registry.yarnpkg.com/@sentry/integrations/-/integrations-7.78.0.tgz#9dc149c0ff92535c412a6f6eeaa6f8613fa0c83a"
+  integrity sha512-h5D2CqM3KPD5hcDFBSsaVGUz95QDuEaKU9juhb96os5zpg5c3VfSWE+u9CuABXu+cXS5+TVfffVrZ+A+YFo+Rg==
   dependencies:
-    "@sentry/core" "7.75.1"
-    "@sentry/types" "7.75.1"
-    "@sentry/utils" "7.75.1"
+    "@sentry/core" "7.78.0"
+    "@sentry/types" "7.78.0"
+    "@sentry/utils" "7.78.0"
     localforage "^1.8.1"
 
-"@sentry/node@7.70.0":
-  version "7.70.0"
-  resolved "https://registry.yarnpkg.com/@sentry/node/-/node-7.70.0.tgz#3d62ee1d7c762a3d15ab1967ab8e6acc805a241a"
-  integrity sha512-GeGlnu3QnJX0GN2FvZ3E31e48ZhRzEpREyC0Wa4BRvYHnyiGvsQjo/0RKeq6vvlggRhVnuoMg/jESyUmdntrAA==
+"@sentry/node@7.78.0", "@sentry/node@^7.73.0":
+  version "7.78.0"
+  resolved "https://registry.yarnpkg.com/@sentry/node/-/node-7.78.0.tgz#ab3b9069a3d46ae461cbb74a13fbe5df3ad49fbd"
+  integrity sha512-gCImN1McfAObOvwgHTef2RZaifcgKt8oqCmctk9MczLJOqjOSzuaigNiCwvyvioe5Eq9jqbZomO6Qx/sG+1gpQ==
   dependencies:
-    "@sentry-internal/tracing" "7.70.0"
-    "@sentry/core" "7.70.0"
-    "@sentry/types" "7.70.0"
-    "@sentry/utils" "7.70.0"
-    cookie "^0.5.0"
+    "@sentry-internal/tracing" "7.78.0"
+    "@sentry/core" "7.78.0"
+    "@sentry/types" "7.78.0"
+    "@sentry/utils" "7.78.0"
     https-proxy-agent "^5.0.0"
-    lru_map "^0.3.3"
-    tslib "^2.4.1 || ^1.9.3"
-
-"@sentry/node@^7.73.0":
-  version "7.73.0"
-  resolved "https://registry.yarnpkg.com/@sentry/node/-/node-7.73.0.tgz#7eecf06689cd8f9d21587ca5cbfdc74543cc8c09"
-  integrity sha512-i50bRfmgkRRx0XXUbg9jGD/RuznDJxJXc4rBILhoJuhl+BjRIaoXA3ayplfJn8JLZxsNh75uJaCq4IUK70SORw==
-  dependencies:
-    "@sentry-internal/tracing" "7.73.0"
-    "@sentry/core" "7.73.0"
-    "@sentry/types" "7.73.0"
-    "@sentry/utils" "7.73.0"
-    cookie "^0.5.0"
-    https-proxy-agent "^5.0.0"
-    lru_map "^0.3.3"
-    tslib "^2.4.1 || ^1.9.3"
 
-"@sentry/react@7.70.0":
-  version "7.70.0"
-  resolved "https://registry.yarnpkg.com/@sentry/react/-/react-7.70.0.tgz#7f72294475f3656914cbd70c00e5fe979144c7e0"
-  integrity sha512-oFd1NEG6S3nczZY8ZFQdEY9ZOfgOvJT1KRoXaSaBIC1KjL0+ngX9TKg+eiYxvI0euxnY5jCwozbA0NsDXqwN7A==
+"@sentry/react@7.78.0":
+  version "7.78.0"
+  resolved "https://registry.yarnpkg.com/@sentry/react/-/react-7.78.0.tgz#a532eebe1b4867cc91ffc0d1e952775f08d91389"
+  integrity sha512-/5+yhXpzbdLehSqAJHAMvFDTBCSEt4WTjqjG7Bjw+w6ALUYwCXQBhCEITLT6tBdMLKO62qz69nuUvrWmaacxXg==
   dependencies:
-    "@sentry/browser" "7.70.0"
-    "@sentry/types" "7.70.0"
-    "@sentry/utils" "7.70.0"
+    "@sentry/browser" "7.78.0"
+    "@sentry/types" "7.78.0"
+    "@sentry/utils" "7.78.0"
     hoist-non-react-statics "^3.3.2"
-    tslib "^2.4.1 || ^1.9.3"
 
-"@sentry/replay@7.70.0":
-  version "7.70.0"
-  resolved "https://registry.yarnpkg.com/@sentry/replay/-/replay-7.70.0.tgz#fd0c75cb0d632e15c8d270af33cb157d328399e8"
-  integrity sha512-XjnyE6ORREz9kBWWHdXaIjS9P2Wo7uEw+y23vfLQwzV0Nx3xJ+FG4dwf8onyIoeCZDKbz7cqQIbugU1gkgUtZw==
+"@sentry/replay@7.78.0":
+  version "7.78.0"
+  resolved "https://registry.yarnpkg.com/@sentry/replay/-/replay-7.78.0.tgz#b657ae24448dc12268afe6cdc37b95e7ae04a8cc"
+  integrity sha512-BYBEJg8rdya8nN5H39ZVsklvFja/TX0Z5evkihCHYOAsUN74SPqmwsFYzziQhswFPJWEp0qpKweC7iuCKCSqyw==
   dependencies:
-    "@sentry/core" "7.70.0"
-    "@sentry/types" "7.70.0"
-    "@sentry/utils" "7.70.0"
+    "@sentry-internal/tracing" "7.78.0"
+    "@sentry/core" "7.78.0"
+    "@sentry/types" "7.78.0"
+    "@sentry/utils" "7.78.0"
 
-"@sentry/tracing@7.70.0":
-  version "7.70.0"
-  resolved "https://registry.yarnpkg.com/@sentry/tracing/-/tracing-7.70.0.tgz#1014e7054cd3e315aeeb790982c3400f1cb7c484"
-  integrity sha512-IBEkYl+RZD8QnRXi2vIa2nC2hueYeK6nK3hxsZNXmNC7x+OzRl/5n1kCH97Zoob2cnuSu9ap/duujC6odiB4Mw==
+"@sentry/tracing@7.78.0":
+  version "7.78.0"
+  resolved "https://registry.yarnpkg.com/@sentry/tracing/-/tracing-7.78.0.tgz#a0e1f7a1640370faf875160c938d183e1b78d8e6"
+  integrity sha512-NSWJZP6upHMYVGqE/4hbKHroqLOr+XjNS37MwXvip3trpIT7GK3JEGXrbkZAsmGhNiGWW3IYXAK169bL0gwX7w==
   dependencies:
-    "@sentry-internal/tracing" "7.70.0"
-
-"@sentry/types@7.70.0":
-  version "7.70.0"
-  resolved "https://registry.yarnpkg.com/@sentry/types/-/types-7.70.0.tgz#c7b533bb18144e3b020550b38cf4812c32d05ffe"
-  integrity sha512-rY4DqpiDBtXSk4MDNBH3dwWqfPbNBI/9GA7Y5WJSIcObBtfBKp0fzYliHJZD0pgM7d4DPFrDn42K9Iiumgymkw==
-
-"@sentry/types@7.73.0":
-  version "7.73.0"
-  resolved "https://registry.yarnpkg.com/@sentry/types/-/types-7.73.0.tgz#6d811bbe413d319df0a592a672d6d72a94a8e716"
-  integrity sha512-/v8++bly8jW7r4cP2wswYiiVpn7eLLcqwnfPUMeCQze4zj3F3nTRIKc9BGHzU0V+fhHa3RwRC2ksqTGq1oJMDg==
+    "@sentry-internal/tracing" "7.78.0"
 
-"@sentry/types@7.75.1":
-  version "7.75.1"
-  resolved "https://registry.yarnpkg.com/@sentry/types/-/types-7.75.1.tgz#48b11336a0e70433d41bbe41c617dd339d4992ea"
-  integrity sha512-km+ygqgMDaFfTrbQwdhrptFqx0Oq15jZABqIoIpbaOCkCAMm+tyCqrFS8dTfaq5wpCktqWOy2qU/DOpppO99Cg==
+"@sentry/types@7.78.0":
+  version "7.78.0"
+  resolved "https://registry.yarnpkg.com/@sentry/types/-/types-7.78.0.tgz#1ed40b43dbf7b92d4e7117d66be312a927cb48e4"
+  integrity sha512-XNyu6EFTrXmKlVgKHOxGdBJ6Aw7BnMBWtptr5TPOQJ4kh+rP+4DB3I6nafcSSUbIsO+hBVgBpj0J8R3Ps86CMQ==
 
-"@sentry/utils@7.70.0":
-  version "7.70.0"
-  resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-7.70.0.tgz#825387ceb10cbb1e145357394b697a1a6d60eb74"
-  integrity sha512-0cChMH0lsGp+5I3D4wOHWwjFN19HVrGUs7iWTLTO5St3EaVbdeLbI1vFXHxMxvopbwgpeZafbreHw/loIdZKpw==
+"@sentry/utils@7.78.0":
+  version "7.78.0"
+  resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-7.78.0.tgz#a3dd459f2347e20af81bfe92b6f75bae95918fb8"
+  integrity sha512-vxPZaMTthMgEgKvlkuqD9rQuQ4Q8fsWAuOuzeuwUbrVCBIeM/WpmyjUUx4ozy6axNGXSXGE4CzrEQUNv3+t9kQ==
   dependencies:
-    "@sentry/types" "7.70.0"
-    tslib "^2.4.1 || ^1.9.3"
-
-"@sentry/utils@7.73.0":
-  version "7.73.0"
-  resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-7.73.0.tgz#530cf023f7c395aa7708cd3824e5a45948449c10"
-  integrity sha512-h3ZK/qpf4k76FhJV9uiSbvMz3V/0Ovy94C+5/9UgPMVCJXFmVsdw8n/dwANJ7LupVPfYP23xFGgebDMFlK1/2w==
-  dependencies:
-    "@sentry/types" "7.73.0"
-    tslib "^2.4.1 || ^1.9.3"
-
-"@sentry/utils@7.75.1":
-  version "7.75.1"
-  resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-7.75.1.tgz#169040ba13ff4d4ecccb7b7aa23f84724d108b97"
-  integrity sha512-QzW2eRjY20epD//9/tQ0FTNwdAL6XZi+LyJNUQIeK3NMnc5NgHrgpxId87gmFq8cNx47utH1Blub8RuMbKqiwQ==
-  dependencies:
-    "@sentry/types" "7.75.1"
+    "@sentry/types" "7.78.0"
 
 "@sidvind/better-ajv-errors@^2.0.0":
   version "2.1.0"
@@ -5093,6 +5057,13 @@
   dependencies:
     "@sinonjs/commons" "^3.0.0"
 
+"@sinonjs/fake-timers@^11.2.2":
+  version "11.2.2"
+  resolved "https://registry.yarnpkg.com/@sinonjs/fake-timers/-/fake-timers-11.2.2.tgz#50063cc3574f4a27bd8453180a04171c85cc9699"
+  integrity sha512-G2piCSxQ7oWOxwGSAyFHfPIsyeJGXYtc6mFbnFA+kRXkiEnTl8c/8jul2S329iFBnDI9HGoeWWAZvuvOkZccgw==
+  dependencies:
+    "@sinonjs/commons" "^3.0.0"
+
 "@sinonjs/fake-timers@^6.0.0", "@sinonjs/fake-timers@^6.0.1":
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/@sinonjs/fake-timers/-/fake-timers-6.0.1.tgz#293674fccb3262ac782c7aadfdeca86b10c75c40"
@@ -5123,107 +5094,108 @@
   resolved "https://registry.yarnpkg.com/@sinonjs/text-encoding/-/text-encoding-0.7.2.tgz#5981a8db18b56ba38ef0efb7d995b12aa7b51918"
   integrity sha512-sXXKG+uL9IrKqViTtao2Ws6dy0znu9sOaP1di/jKGW1M6VssO8vlpXCQcpZ+jisQ1tTFAC5Jo/EOzFbggBagFQ==
 
-"@smithy/abort-controller@^2.0.5":
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/@smithy/abort-controller/-/abort-controller-2.0.5.tgz#9602a9b362e84c0d043d820c4aba5d9b78028a84"
-  integrity sha512-byVZ2KWLMPYAZGKjRpniAzLcygJO4ruClZKdJTuB0eCB76ONFTdptBHlviHpAZXknRz7skYWPfcgO9v30A1SyA==
+"@smithy/abort-controller@^2.0.12":
+  version "2.0.12"
+  resolved "https://registry.yarnpkg.com/@smithy/abort-controller/-/abort-controller-2.0.12.tgz#62cd47c81fa1d7d6c2d6fde0c2f54ea89892fb6a"
+  integrity sha512-YIJyefe1mi3GxKdZxEBEuzYOeQ9xpYfqnFmWzojCssRAuR7ycxwpoRQgp965vuW426xUAQhCV5rCaWElQ7XsaA==
   dependencies:
-    "@smithy/types" "^2.2.2"
+    "@smithy/types" "^2.4.0"
     tslib "^2.5.0"
 
-"@smithy/config-resolver@^2.0.5":
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/@smithy/config-resolver/-/config-resolver-2.0.5.tgz#d64c1c83a773ca5a038146d4b537c202b6c6bfaf"
-  integrity sha512-n0c2AXz+kjALY2FQr7Zy9zhYigXzboIh1AuUUVCqFBKFtdEvTwnwPXrTDoEehLiRTUHNL+4yzZ3s+D0kKYSLSg==
+"@smithy/config-resolver@^2.0.16":
+  version "2.0.16"
+  resolved "https://registry.yarnpkg.com/@smithy/config-resolver/-/config-resolver-2.0.16.tgz#f2abf65a21f56731fdab2d39d2df2dd0e377c9cc"
+  integrity sha512-1k+FWHQDt2pfpXhJsOmNMmlAZ3NUQ98X5tYsjQhVGq+0X6cOBMhfh6Igd0IX3Ut6lEO6DQAdPMI/blNr3JZfMQ==
   dependencies:
-    "@smithy/types" "^2.2.2"
+    "@smithy/node-config-provider" "^2.1.3"
+    "@smithy/types" "^2.4.0"
     "@smithy/util-config-provider" "^2.0.0"
-    "@smithy/util-middleware" "^2.0.0"
+    "@smithy/util-middleware" "^2.0.5"
     tslib "^2.5.0"
 
-"@smithy/credential-provider-imds@^2.0.0", "@smithy/credential-provider-imds@^2.0.5":
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/@smithy/credential-provider-imds/-/credential-provider-imds-2.0.5.tgz#59e6f8d30beed9e966d418f47108bb4da371bbae"
-  integrity sha512-KFcf/e0meFkQNyteJ65f1G19sgUEY1e5zL7hyAEUPz2SEfBmC9B37WyRq87G3MEEsvmAWwCRu7nFFYUKtR3svQ==
+"@smithy/credential-provider-imds@^2.0.0", "@smithy/credential-provider-imds@^2.0.18":
+  version "2.0.18"
+  resolved "https://registry.yarnpkg.com/@smithy/credential-provider-imds/-/credential-provider-imds-2.0.18.tgz#9a5b8be3f268bb4ac7b7ef321f57b0e9a61e2940"
+  integrity sha512-QnPBi6D2zj6AHJdUTo5zXmk8vwHJ2bNevhcVned1y+TZz/OI5cizz5DsYNkqFUIDn8tBuEyKNgbmKVNhBbuY3g==
   dependencies:
-    "@smithy/node-config-provider" "^2.0.5"
-    "@smithy/property-provider" "^2.0.5"
-    "@smithy/types" "^2.2.2"
-    "@smithy/url-parser" "^2.0.5"
+    "@smithy/node-config-provider" "^2.1.3"
+    "@smithy/property-provider" "^2.0.13"
+    "@smithy/types" "^2.4.0"
+    "@smithy/url-parser" "^2.0.12"
     tslib "^2.5.0"
 
-"@smithy/eventstream-codec@^2.0.5":
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/@smithy/eventstream-codec/-/eventstream-codec-2.0.5.tgz#771f50657f1958db3e19b9f2726d62e2e0672546"
-  integrity sha512-iqR6OuOV3zbQK8uVs9o+9AxhVk8kW9NAxA71nugwUB+kTY9C35pUd0A5/m4PRT0Y0oIW7W4kgnSR3fdYXQjECw==
+"@smithy/eventstream-codec@^2.0.12", "@smithy/eventstream-codec@^2.0.5":
+  version "2.0.12"
+  resolved "https://registry.yarnpkg.com/@smithy/eventstream-codec/-/eventstream-codec-2.0.12.tgz#99fab750d0ac3941f341d912d3c3a1ab985e1a7a"
+  integrity sha512-ZZQLzHBJkbiAAdj2C5K+lBlYp/XJ+eH2uy+jgJgYIFW/o5AM59Hlj7zyI44/ZTDIQWmBxb3EFv/c5t44V8/g8A==
   dependencies:
     "@aws-crypto/crc32" "3.0.0"
-    "@smithy/types" "^2.2.2"
+    "@smithy/types" "^2.4.0"
     "@smithy/util-hex-encoding" "^2.0.0"
     tslib "^2.5.0"
 
-"@smithy/eventstream-serde-browser@^2.0.5":
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/@smithy/eventstream-serde-browser/-/eventstream-serde-browser-2.0.5.tgz#5f4d3d78a9fcb0a5a6f5b20f69141c8cc6b0ef6b"
-  integrity sha512-8NU51y94qFJbxL6SmvgWDfITHO/svvbAigkLYk2pckX17TGCSf4EXuGpGLliJp5Ljh5+vASC7mUH2jYX7MWBxA==
+"@smithy/eventstream-serde-browser@^2.0.12":
+  version "2.0.12"
+  resolved "https://registry.yarnpkg.com/@smithy/eventstream-serde-browser/-/eventstream-serde-browser-2.0.12.tgz#46b578cf30ec4b91139800d89a752502d2b28a41"
+  integrity sha512-0pi8QlU/pwutNshoeJcbKR1p7Ie5STd8UFAMX5xhSoSJjNlxIv/OsHbF023jscMRN2Prrqd6ToGgdCnsZVQjvg==
   dependencies:
-    "@smithy/eventstream-serde-universal" "^2.0.5"
-    "@smithy/types" "^2.2.2"
+    "@smithy/eventstream-serde-universal" "^2.0.12"
+    "@smithy/types" "^2.4.0"
     tslib "^2.5.0"
 
-"@smithy/eventstream-serde-config-resolver@^2.0.5":
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/@smithy/eventstream-serde-config-resolver/-/eventstream-serde-config-resolver-2.0.5.tgz#1e551a308dc2e91b8c732815077dbf99beb1300f"
-  integrity sha512-u3gvukRaTH4X6tsryuZ4T1WGIEP34fPaTTzphFDJe8GJz/k11oBW1MPnkcaucBMxLnObK9swCF85j5cp1Kj1oA==
+"@smithy/eventstream-serde-config-resolver@^2.0.12":
+  version "2.0.12"
+  resolved "https://registry.yarnpkg.com/@smithy/eventstream-serde-config-resolver/-/eventstream-serde-config-resolver-2.0.12.tgz#07871d226561394dfd6b468a7ede142b01491a76"
+  integrity sha512-I0XfwQkIX3gAnbrU5rLMkBSjTM9DHttdbLwf12CXmj7SSI5dT87PxtKLRrZGanaCMbdf2yCep+MW5/4M7IbvQA==
   dependencies:
-    "@smithy/types" "^2.2.2"
+    "@smithy/types" "^2.4.0"
     tslib "^2.5.0"
 
-"@smithy/eventstream-serde-node@^2.0.5":
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/@smithy/eventstream-serde-node/-/eventstream-serde-node-2.0.5.tgz#ceea04afcef95caf0e4148c606721c1882a1d9b5"
-  integrity sha512-/C8jb+k/vKUBIe80D30vzjvRXlJf76kG2AJY7/NwiqWuD2usRuuDFCDaswXdVsSh9P1+FeaxZ48chsK10yDryQ==
+"@smithy/eventstream-serde-node@^2.0.12":
+  version "2.0.12"
+  resolved "https://registry.yarnpkg.com/@smithy/eventstream-serde-node/-/eventstream-serde-node-2.0.12.tgz#9f27037b7c782f9cbde6cc10a054df37915b0726"
+  integrity sha512-vf1vMHGOkG3uqN9x1zKOhnvW/XgvhJXWqjV6zZiT2FMjlEayugQ1mzpSqr7uf89+BzjTzuZKERmOsEAmewLbxw==
   dependencies:
-    "@smithy/eventstream-serde-universal" "^2.0.5"
-    "@smithy/types" "^2.2.2"
+    "@smithy/eventstream-serde-universal" "^2.0.12"
+    "@smithy/types" "^2.4.0"
     tslib "^2.5.0"
 
-"@smithy/eventstream-serde-universal@^2.0.5":
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/@smithy/eventstream-serde-universal/-/eventstream-serde-universal-2.0.5.tgz#5a656557575ee4ad69515434e45f19f7816f09f8"
-  integrity sha512-+vHvbQtlSVYTQ/20tNpVaKi0EpTR7E8GoEUHJypRZIRgiT03b3h2MAWk+SNaqMrCJrYG9vKLkJFzDylRlUvDWg==
+"@smithy/eventstream-serde-universal@^2.0.12":
+  version "2.0.12"
+  resolved "https://registry.yarnpkg.com/@smithy/eventstream-serde-universal/-/eventstream-serde-universal-2.0.12.tgz#59593439e153c576ab2d46f233c7bc4ddc364cb3"
+  integrity sha512-xZ3ZNpCxIND+q+UCy7y1n1/5VQEYicgSTNCcPqsKawX+Vd+6OcFX7gUHMyPzL8cZr+GdmJuxNleqHlH4giK2tw==
   dependencies:
-    "@smithy/eventstream-codec" "^2.0.5"
-    "@smithy/types" "^2.2.2"
+    "@smithy/eventstream-codec" "^2.0.12"
+    "@smithy/types" "^2.4.0"
     tslib "^2.5.0"
 
-"@smithy/fetch-http-handler@^2.0.5":
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/@smithy/fetch-http-handler/-/fetch-http-handler-2.0.5.tgz#822510720598b4306e7c71e839eea34b6928c66b"
-  integrity sha512-EzFoMowdBNy1VqtvkiXgPFEdosIAt4/4bgZ8uiDiUyfhmNXq/3bV+CagPFFBsgFOR/X2XK4zFZHRsoa7PNHVVg==
+"@smithy/fetch-http-handler@^2.2.4":
+  version "2.2.4"
+  resolved "https://registry.yarnpkg.com/@smithy/fetch-http-handler/-/fetch-http-handler-2.2.4.tgz#405716581a5a336f2c162daf4169bff600fc47ce"
+  integrity sha512-gIPRFEGi+c6V52eauGKrjDzPWF2Cu7Z1r5F8A3j2wcwz25sPG/t8kjsbEhli/tS/2zJp/ybCZXe4j4ro3yv/HA==
   dependencies:
-    "@smithy/protocol-http" "^2.0.5"
-    "@smithy/querystring-builder" "^2.0.5"
-    "@smithy/types" "^2.2.2"
+    "@smithy/protocol-http" "^3.0.8"
+    "@smithy/querystring-builder" "^2.0.12"
+    "@smithy/types" "^2.4.0"
     "@smithy/util-base64" "^2.0.0"
     tslib "^2.5.0"
 
-"@smithy/hash-node@^2.0.5":
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/@smithy/hash-node/-/hash-node-2.0.5.tgz#f3558c1553f846148c3e5d10a815429e1b357668"
-  integrity sha512-mk551hIywBITT+kXruRNXk7f8Fy7DTzBjZJSr/V6nolYKmUHIG3w5QU6nO9qPYEQGKc/yEPtkpdS28ndeG93lA==
+"@smithy/hash-node@^2.0.12":
+  version "2.0.12"
+  resolved "https://registry.yarnpkg.com/@smithy/hash-node/-/hash-node-2.0.12.tgz#514586ca3f54840322273029eef66c41d9001e39"
+  integrity sha512-fDZnTr5j9t5qcbeJ037aMZXxMka13Znqwrgy3PAqYj6Dm3XHXHftTH3q+NWgayUxl1992GFtQt1RuEzRMy3NnQ==
   dependencies:
-    "@smithy/types" "^2.2.2"
+    "@smithy/types" "^2.4.0"
     "@smithy/util-buffer-from" "^2.0.0"
     "@smithy/util-utf8" "^2.0.0"
     tslib "^2.5.0"
 
-"@smithy/invalid-dependency@^2.0.5":
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/@smithy/invalid-dependency/-/invalid-dependency-2.0.5.tgz#b07bdbc43403977b8bcae6de19a96e184f2eb655"
-  integrity sha512-0wEi+JT0hM+UUwrJVYbqjuGFhy5agY/zXyiN7BNAJ1XoCDjU5uaNSj8ekPWsXd/d4yM6NSe8UbPd8cOc1+3oBQ==
+"@smithy/invalid-dependency@^2.0.12":
+  version "2.0.12"
+  resolved "https://registry.yarnpkg.com/@smithy/invalid-dependency/-/invalid-dependency-2.0.12.tgz#de78a5e9457cc397aad0648e18c0260b522fe604"
+  integrity sha512-p5Y+iMHV3SoEpy3VSR7mifbreHQwVSvHSAz/m4GdoXfOzKzaYC8hYv10Ks7Deblkf7lhas8U+lAp9ThbBM+ZXA==
   dependencies:
-    "@smithy/types" "^2.2.2"
+    "@smithy/types" "^2.4.0"
     tslib "^2.5.0"
 
 "@smithy/is-array-buffer@^2.0.0":
@@ -5233,119 +5205,125 @@
   dependencies:
     tslib "^2.5.0"
 
-"@smithy/middleware-content-length@^2.0.5":
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/@smithy/middleware-content-length/-/middleware-content-length-2.0.5.tgz#b2008c6b664c4c67fb255ef5a9fd5f4bd2c914f6"
-  integrity sha512-E7VwV5H02fgZIUGRli4GevBCAPvkyEI/fgl9SU47nPPi3DAAX3nEtUb8xfGbXjOcJ5BdSUoWWZn42tEd/blOqA==
+"@smithy/middleware-content-length@^2.0.14":
+  version "2.0.14"
+  resolved "https://registry.yarnpkg.com/@smithy/middleware-content-length/-/middleware-content-length-2.0.14.tgz#ee1aa842490cee90b6ac208fb13a7d56d3ed84f2"
+  integrity sha512-poUNgKTw9XwPXfX9nEHpVgrMNVpaSMZbshqvPxFVoalF4wp6kRzYKOfdesSVectlQ51VtigoLfbXcdyPwvxgTg==
   dependencies:
-    "@smithy/protocol-http" "^2.0.5"
-    "@smithy/types" "^2.2.2"
+    "@smithy/protocol-http" "^3.0.8"
+    "@smithy/types" "^2.4.0"
     tslib "^2.5.0"
 
-"@smithy/middleware-endpoint@^2.0.5":
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/@smithy/middleware-endpoint/-/middleware-endpoint-2.0.5.tgz#6a16361dc527262958194e48343733ac6285776b"
-  integrity sha512-tyzDuoNTbsMQCq5Xkc4QOt6e2GACUllQIV8SQ5fc59FtOIV9/vbf58/GxVjZm2o8+MMbdDBANjTDZe/ijZKfyA==
-  dependencies:
-    "@smithy/middleware-serde" "^2.0.5"
-    "@smithy/types" "^2.2.2"
-    "@smithy/url-parser" "^2.0.5"
-    "@smithy/util-middleware" "^2.0.0"
+"@smithy/middleware-endpoint@^2.1.3":
+  version "2.1.3"
+  resolved "https://registry.yarnpkg.com/@smithy/middleware-endpoint/-/middleware-endpoint-2.1.3.tgz#ab7ebff4ecbc9b02ec70dd57179f47c4f16bf03f"
+  integrity sha512-ZrQ0/YX6hNVTxqMEHtEaDbDv6pNeEji/a5Vk3HuFC5R3ZY8lfoATyxmOGxBVYnF3NUvZLNC7umEv1WzWGWvCGQ==
+  dependencies:
+    "@smithy/middleware-serde" "^2.0.12"
+    "@smithy/node-config-provider" "^2.1.3"
+    "@smithy/shared-ini-file-loader" "^2.2.2"
+    "@smithy/types" "^2.4.0"
+    "@smithy/url-parser" "^2.0.12"
+    "@smithy/util-middleware" "^2.0.5"
     tslib "^2.5.0"
 
-"@smithy/middleware-retry@^2.0.5":
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/@smithy/middleware-retry/-/middleware-retry-2.0.5.tgz#bbf8858aeccdfe11837f89635cb6ce8a8e304518"
-  integrity sha512-ulIfbFyzQTVnJbLjUl1CTSi0etg6tej/ekwaLp0Gn8ybUkDkKYa+uB6CF/m2J5B6meRwyJlsryR+DjaOVyiicg==
-  dependencies:
-    "@smithy/protocol-http" "^2.0.5"
-    "@smithy/service-error-classification" "^2.0.0"
-    "@smithy/types" "^2.2.2"
-    "@smithy/util-middleware" "^2.0.0"
-    "@smithy/util-retry" "^2.0.0"
+"@smithy/middleware-retry@^2.0.18":
+  version "2.0.18"
+  resolved "https://registry.yarnpkg.com/@smithy/middleware-retry/-/middleware-retry-2.0.18.tgz#37982552a1d3815148797831df025e470423fc5e"
+  integrity sha512-VyrHQRldGSb3v9oFOB5yPxmLT7U2sQic2ytylOnYlnsmVOLlFIaI6sW22c+w2675yq+XZ6HOuzV7x2OBYCWRNA==
+  dependencies:
+    "@smithy/node-config-provider" "^2.1.3"
+    "@smithy/protocol-http" "^3.0.8"
+    "@smithy/service-error-classification" "^2.0.5"
+    "@smithy/types" "^2.4.0"
+    "@smithy/util-middleware" "^2.0.5"
+    "@smithy/util-retry" "^2.0.5"
     tslib "^2.5.0"
     uuid "^8.3.2"
 
-"@smithy/middleware-serde@^2.0.5":
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/@smithy/middleware-serde/-/middleware-serde-2.0.5.tgz#3f3635cb437a3fba46cd1407d3adf53d41328574"
-  integrity sha512-in0AA5sous74dOfTGU9rMJBXJ0bDVNxwdXtEt5lh3FVd2sEyjhI+rqpLLRF1E4ixbw3RSEf80hfRpcPdjg4vvQ==
+"@smithy/middleware-serde@^2.0.12":
+  version "2.0.12"
+  resolved "https://registry.yarnpkg.com/@smithy/middleware-serde/-/middleware-serde-2.0.12.tgz#edc93c400a5ffec6c068419163f9d880bdff5e5b"
+  integrity sha512-IBeco157lIScecq2Z+n0gq56i4MTnfKxS7rbfrAORveDJgnbBAaEQgYqMqp/cYqKrpvEXcyTjwKHrBjCCIZh2A==
   dependencies:
-    "@smithy/types" "^2.2.2"
+    "@smithy/types" "^2.4.0"
     tslib "^2.5.0"
 
-"@smithy/middleware-stack@^2.0.0":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@smithy/middleware-stack/-/middleware-stack-2.0.0.tgz#cd9f442c2788b1ef0ea6b32236d80c76b3c342e9"
-  integrity sha512-31XC1xNF65nlbc16yuh3wwTudmqs6qy4EseQUGF8A/p2m/5wdd/cnXJqpniy/XvXVwkHPz/GwV36HqzHtIKATQ==
+"@smithy/middleware-stack@^2.0.6":
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/@smithy/middleware-stack/-/middleware-stack-2.0.6.tgz#c58d6e4ffc4498bf47fd27adcddd142395d3ba84"
+  integrity sha512-YSvNZeOKWLJ0M/ycxwDIe2Ztkp6Qixmcml1ggsSv2fdHKGkBPhGrX5tMzPGMI1yyx55UEYBi2OB4s+RriXX48A==
   dependencies:
+    "@smithy/types" "^2.4.0"
     tslib "^2.5.0"
 
-"@smithy/node-config-provider@^2.0.5":
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/@smithy/node-config-provider/-/node-config-provider-2.0.5.tgz#239a6281e1d0bc2a0dd8fdab7826bacd25dfbf00"
-  integrity sha512-LRtjV9WkhONe2lVy+ipB/l1GX60ybzBmFyeRUoLUXWKdnZ3o81jsnbKzMK8hKq8eFSWPk+Lmyx6ZzCQabGeLxg==
+"@smithy/node-config-provider@^2.1.3":
+  version "2.1.3"
+  resolved "https://registry.yarnpkg.com/@smithy/node-config-provider/-/node-config-provider-2.1.3.tgz#bf4cee69df08d43618ad4329d234351b14d98ef7"
+  integrity sha512-J6lXvRHGVnSX3n1PYi+e1L5HN73DkkJpUviV3Ebf+8wSaIjAf+eVNbzyvh/S5EQz7nf4KVfwbD5vdoZMAthAEQ==
   dependencies:
-    "@smithy/property-provider" "^2.0.5"
-    "@smithy/shared-ini-file-loader" "^2.0.5"
-    "@smithy/types" "^2.2.2"
+    "@smithy/property-provider" "^2.0.13"
+    "@smithy/shared-ini-file-loader" "^2.2.2"
+    "@smithy/types" "^2.4.0"
     tslib "^2.5.0"
 
-"@smithy/node-http-handler@^2.0.5":
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/@smithy/node-http-handler/-/node-http-handler-2.0.5.tgz#19c1bdd4d61502bc9c793dddb8ce995626ca6585"
-  integrity sha512-lZm5DZf4b3V0saUw9WTC4/du887P6cy2fUyQgQQKRRV6OseButyD5yTzeMmXE53CaXJBMBsUvvIQ0hRVxIq56w==
+"@smithy/node-http-handler@^2.1.8":
+  version "2.1.8"
+  resolved "https://registry.yarnpkg.com/@smithy/node-http-handler/-/node-http-handler-2.1.8.tgz#aad989d5445c43a677e7e6161c6fa4abd0e46023"
+  integrity sha512-KZylM7Wff/So5SmCiwg2kQNXJ+RXgz34wkxS7WNwIUXuZrZZpY/jKJCK+ZaGyuESDu3TxcaY+zeYGJmnFKbQsA==
   dependencies:
-    "@smithy/abort-controller" "^2.0.5"
-    "@smithy/protocol-http" "^2.0.5"
-    "@smithy/querystring-builder" "^2.0.5"
-    "@smithy/types" "^2.2.2"
+    "@smithy/abort-controller" "^2.0.12"
+    "@smithy/protocol-http" "^3.0.8"
+    "@smithy/querystring-builder" "^2.0.12"
+    "@smithy/types" "^2.4.0"
     tslib "^2.5.0"
 
-"@smithy/property-provider@^2.0.0", "@smithy/property-provider@^2.0.5":
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/@smithy/property-provider/-/property-provider-2.0.5.tgz#7cc88bc56706a4758076754a71c6a9ebf5daa8a7"
-  integrity sha512-cAFSUhX6aiHcmpWfrCLKvwBtgN1F6A0N8qY/8yeSi0LRLmhGqsY1/YTxFE185MCVzYbqBGXVr9TBv4RUcIV4rA==
+"@smithy/property-provider@^2.0.0", "@smithy/property-provider@^2.0.13":
+  version "2.0.13"
+  resolved "https://registry.yarnpkg.com/@smithy/property-provider/-/property-provider-2.0.13.tgz#45ee47ad79d638082523f944c49fd2e851312098"
+  integrity sha512-VJqUf2CbsQX6uUiC5dUPuoEATuFjkbkW3lJHbRnpk9EDC9X+iKqhfTK+WP+lve5EQ9TcCI1Q6R7hrg41FyC54w==
   dependencies:
-    "@smithy/types" "^2.2.2"
+    "@smithy/types" "^2.4.0"
     tslib "^2.5.0"
 
-"@smithy/protocol-http@^2.0.5":
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/@smithy/protocol-http/-/protocol-http-2.0.5.tgz#ff7779fc8fcd3fe52e71fd07565b518f0937e8ba"
-  integrity sha512-d2hhHj34mA2V86doiDfrsy2fNTnUOowGaf9hKb0hIPHqvcnShU4/OSc4Uf1FwHkAdYF3cFXTrj5VGUYbEuvMdw==
+"@smithy/protocol-http@^3.0.8":
+  version "3.0.8"
+  resolved "https://registry.yarnpkg.com/@smithy/protocol-http/-/protocol-http-3.0.8.tgz#0f7c114f6b8e23a57dff7a275d085bac97b9233c"
+  integrity sha512-SHJvYeWq8q0FK8xHk+xjV9dzDUDjFMT+G1pZbV+XB6OVoac/FSVshlMNPeUJ8AmSkcDKHRu5vASnRqZHgD3qhw==
   dependencies:
-    "@smithy/types" "^2.2.2"
+    "@smithy/types" "^2.4.0"
     tslib "^2.5.0"
 
-"@smithy/querystring-builder@^2.0.5":
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/@smithy/querystring-builder/-/querystring-builder-2.0.5.tgz#c5a873769de56ef57ae3b4d2c58fc7f68184a89c"
-  integrity sha512-4DCX9krxLzATj+HdFPC3i8pb7XTAWzzKqSw8aTZMjXjtQY+vhe4azMAqIvbb6g7JKwIkmkRAjK6EXO3YWSnJVQ==
+"@smithy/querystring-builder@^2.0.12":
+  version "2.0.12"
+  resolved "https://registry.yarnpkg.com/@smithy/querystring-builder/-/querystring-builder-2.0.12.tgz#d13e0eea08d43596bdbb182206ccdee0956d06fd"
+  integrity sha512-cDbF07IuCjiN8CdGvPzfJjXIrmDSelScRfyJYrYBNBbKl2+k7QD/KqiHhtRyEKgID5mmEVrV6KE6L/iPJ98sFw==
   dependencies:
-    "@smithy/types" "^2.2.2"
+    "@smithy/types" "^2.4.0"
     "@smithy/util-uri-escape" "^2.0.0"
     tslib "^2.5.0"
 
-"@smithy/querystring-parser@^2.0.5":
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/@smithy/querystring-parser/-/querystring-parser-2.0.5.tgz#aec6733ed4497402634978e7026d0d00661594d6"
-  integrity sha512-C2stCULH0r54KBksv3AWcN8CLS3u9+WsEW8nBrvctrJ5rQTNa1waHkffpVaiKvcW2nP0aIMBPCobD/kYf/q9mA==
+"@smithy/querystring-parser@^2.0.12":
+  version "2.0.12"
+  resolved "https://registry.yarnpkg.com/@smithy/querystring-parser/-/querystring-parser-2.0.12.tgz#d2c234031e266359716a0c62c8c1208a5bd2557e"
+  integrity sha512-fytyTcXaMzPBuNtPlhj5v6dbl4bJAnwKZFyyItAGt4Tgm9HFPZNo7a9r1SKPr/qdxUEBzvL9Rh+B9SkTX3kFxg==
   dependencies:
-    "@smithy/types" "^2.2.2"
+    "@smithy/types" "^2.4.0"
     tslib "^2.5.0"
 
-"@smithy/service-error-classification@^2.0.0":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@smithy/service-error-classification/-/service-error-classification-2.0.0.tgz#bbce07c9c529d9333d40db881fd4a1795dd84892"
-  integrity sha512-2z5Nafy1O0cTf69wKyNjGW/sNVMiqDnb4jgwfMG8ye8KnFJ5qmJpDccwIbJNhXIfbsxTg9SEec2oe1cexhMJvw==
-
-"@smithy/shared-ini-file-loader@^2.0.0", "@smithy/shared-ini-file-loader@^2.0.5":
+"@smithy/service-error-classification@^2.0.5":
   version "2.0.5"
-  resolved "https://registry.yarnpkg.com/@smithy/shared-ini-file-loader/-/shared-ini-file-loader-2.0.5.tgz#c2b28b499f2b9928e892a80fcdeb259b2938475c"
-  integrity sha512-Mvtk6FwMtfbKRC4YuSsIqRYp9WTxsSUJVVo2djgyhcacKGMqicHDWSAmgy3sDrKv+G/G6xTZCPwm6pJARtdxVg==
+  resolved "https://registry.yarnpkg.com/@smithy/service-error-classification/-/service-error-classification-2.0.5.tgz#22c84fad456730adfa31cae91d47acd31304c346"
+  integrity sha512-M0SeJnEgD2ywJyV99Fb1yKFzmxDe9JfpJiYTVSRMyRLc467BPU0qsuuDPzMCdB1mU8M8u1rVOdkqdoyFN8UFTw==
   dependencies:
-    "@smithy/types" "^2.2.2"
+    "@smithy/types" "^2.4.0"
+
+"@smithy/shared-ini-file-loader@^2.0.6", "@smithy/shared-ini-file-loader@^2.2.2":
+  version "2.2.2"
+  resolved "https://registry.yarnpkg.com/@smithy/shared-ini-file-loader/-/shared-ini-file-loader-2.2.2.tgz#b52064c5254a01f5c98a821207448de439938667"
+  integrity sha512-noyQUPn7b1M8uB0GEXc/Zyxq+5K2b7aaqWnLp+hgJ7+xu/FCvtyWy5eWLDjQEsHnAet2IZhS5QF8872OR69uNg==
+  dependencies:
+    "@smithy/types" "^2.4.0"
     tslib "^2.5.0"
 
 "@smithy/signature-v4@^2.0.0":
@@ -5362,30 +5340,30 @@
     "@smithy/util-utf8" "^2.0.0"
     tslib "^2.5.0"
 
-"@smithy/smithy-client@^2.0.5":
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/@smithy/smithy-client/-/smithy-client-2.0.5.tgz#7941449f146d2c61d34670779d77d4a085141bc1"
-  integrity sha512-kCTFr8wfOAWKDzGvfBElc6shHigWtHNhMQ1IbosjC4jOlayFyZMSs2PysKB+Ox/dhQ41KqOzgVjgiQ+PyWqHMQ==
+"@smithy/smithy-client@^2.1.12":
+  version "2.1.12"
+  resolved "https://registry.yarnpkg.com/@smithy/smithy-client/-/smithy-client-2.1.12.tgz#a7f10ab846d41ce1042eb81f087c4c9eb438b481"
+  integrity sha512-XXqhridfkKnpj+lt8vM6HRlZbqUAqBjVC74JIi13F/AYQd/zTj9SOyGfxnbp4mjY9q28LityxIuV8CTinr9r5w==
   dependencies:
-    "@smithy/middleware-stack" "^2.0.0"
-    "@smithy/types" "^2.2.2"
-    "@smithy/util-stream" "^2.0.5"
+    "@smithy/middleware-stack" "^2.0.6"
+    "@smithy/types" "^2.4.0"
+    "@smithy/util-stream" "^2.0.17"
     tslib "^2.5.0"
 
-"@smithy/types@^2.2.2":
-  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/@smithy/types/-/types-2.2.2.tgz#bd8691eb92dd07ac33b83e0e1c45f283502b1bf7"
-  integrity sha512-4PS0y1VxDnELGHGgBWlDksB2LJK8TG8lcvlWxIsgR+8vROI7Ms8h1P4FQUx+ftAX2QZv5g1CJCdhdRmQKyonyw==
+"@smithy/types@^2.2.2", "@smithy/types@^2.4.0":
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/@smithy/types/-/types-2.4.0.tgz#ed35e429e3ea3d089c68ed1bf951d0ccbdf2692e"
+  integrity sha512-iH1Xz68FWlmBJ9vvYeHifVMWJf82ONx+OybPW8ZGf5wnEv2S0UXcU4zwlwJkRXuLKpcSLHrraHbn2ucdVXLb4g==
   dependencies:
     tslib "^2.5.0"
 
-"@smithy/url-parser@^2.0.5":
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/@smithy/url-parser/-/url-parser-2.0.5.tgz#09fa623076bb5861892930628bf368d5c79fd7d9"
-  integrity sha512-OdMBvZhpckQSkugCXNJQCvqJ71wE7Ftxce92UOQLQ9pwF6hoS5PLL7wEfpnuEXtStzBqJYkzu1C1ZfjuFGOXAA==
+"@smithy/url-parser@^2.0.12":
+  version "2.0.12"
+  resolved "https://registry.yarnpkg.com/@smithy/url-parser/-/url-parser-2.0.12.tgz#a4cdd1b66176e48f10d119298f8f90b06b7e8a01"
+  integrity sha512-qgkW2mZqRvlNUcBkxYB/gYacRaAdck77Dk3/g2iw0S9F0EYthIS3loGfly8AwoWpIvHKhkTsCXXQfzksgZ4zIA==
   dependencies:
-    "@smithy/querystring-parser" "^2.0.5"
-    "@smithy/types" "^2.2.2"
+    "@smithy/querystring-parser" "^2.0.12"
+    "@smithy/types" "^2.4.0"
     tslib "^2.5.0"
 
 "@smithy/util-base64@^2.0.0":
@@ -5425,26 +5403,37 @@
   dependencies:
     tslib "^2.5.0"
 
-"@smithy/util-defaults-mode-browser@^2.0.5":
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/@smithy/util-defaults-mode-browser/-/util-defaults-mode-browser-2.0.5.tgz#36d5424749d324bd69f37c74ea20a183f8c2286e"
-  integrity sha512-yciP6TPttLsj731aHTvekgyuCGXQrEAJibEwEWAh3kzaDsfGAVCuZSBlyvC2Dl3TZmHKCOQwHV8mIE7KQCTPuQ==
+"@smithy/util-defaults-mode-browser@^2.0.16":
+  version "2.0.16"
+  resolved "https://registry.yarnpkg.com/@smithy/util-defaults-mode-browser/-/util-defaults-mode-browser-2.0.16.tgz#7d60c4e1d00ed569f47fd6343b822c4ff3c2c9f8"
+  integrity sha512-Uv5Cu8nVkuvLn0puX+R9zWbSNpLIR3AxUlPoLJ7hC5lvir8B2WVqVEkJLwtixKAncVLasnTVjPDCidtAUTGEQw==
   dependencies:
-    "@smithy/property-provider" "^2.0.5"
-    "@smithy/types" "^2.2.2"
+    "@smithy/property-provider" "^2.0.13"
+    "@smithy/smithy-client" "^2.1.12"
+    "@smithy/types" "^2.4.0"
     bowser "^2.11.0"
     tslib "^2.5.0"
 
-"@smithy/util-defaults-mode-node@^2.0.5":
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/@smithy/util-defaults-mode-node/-/util-defaults-mode-node-2.0.5.tgz#504dd39a603fd2d67e53537c794dd57e6541baae"
-  integrity sha512-M07t99rWasXt+IaDZDyP3BkcoEm/mgIE1RIMASrE49LKSNxaVN7PVcgGc77+4uu2kzBAyqJKy79pgtezuknyjQ==
+"@smithy/util-defaults-mode-node@^2.0.21":
+  version "2.0.21"
+  resolved "https://registry.yarnpkg.com/@smithy/util-defaults-mode-node/-/util-defaults-mode-node-2.0.21.tgz#d10c887b3e641c63e235ce95ba32137fd0bd1838"
+  integrity sha512-cUEsttVZ79B7Al2rWK2FW03HBpD9LyuqFtm+1qFty5u9sHSdesr215gS2Ln53fTopNiPgeXpdoM3IgjvIO0rJw==
+  dependencies:
+    "@smithy/config-resolver" "^2.0.16"
+    "@smithy/credential-provider-imds" "^2.0.18"
+    "@smithy/node-config-provider" "^2.1.3"
+    "@smithy/property-provider" "^2.0.13"
+    "@smithy/smithy-client" "^2.1.12"
+    "@smithy/types" "^2.4.0"
+    tslib "^2.5.0"
+
+"@smithy/util-endpoints@^1.0.2":
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/@smithy/util-endpoints/-/util-endpoints-1.0.2.tgz#8be5b840c19661e3830ca10973f775b331bd94cd"
+  integrity sha512-QEdq+sP68IJHAMVB2ugKVVZEWeKQtZLuf+akHzc8eTVElsZ2ZdVLWC6Cp+uKjJ/t4yOj1qu6ZzyxJQEQ8jdEjg==
   dependencies:
-    "@smithy/config-resolver" "^2.0.5"
-    "@smithy/credential-provider-imds" "^2.0.5"
-    "@smithy/node-config-provider" "^2.0.5"
-    "@smithy/property-provider" "^2.0.5"
-    "@smithy/types" "^2.2.2"
+    "@smithy/node-config-provider" "^2.1.3"
+    "@smithy/types" "^2.4.0"
     tslib "^2.5.0"
 
 "@smithy/util-hex-encoding@^2.0.0":
@@ -5454,29 +5443,31 @@
   dependencies:
     tslib "^2.5.0"
 
-"@smithy/util-middleware@^2.0.0":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@smithy/util-middleware/-/util-middleware-2.0.0.tgz#706681d4a1686544a2275f68266304233f372c99"
-  integrity sha512-eCWX4ECuDHn1wuyyDdGdUWnT4OGyIzV0LN1xRttBFMPI9Ff/4heSHVxneyiMtOB//zpXWCha1/SWHJOZstG7kA==
+"@smithy/util-middleware@^2.0.0", "@smithy/util-middleware@^2.0.5":
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/@smithy/util-middleware/-/util-middleware-2.0.5.tgz#c63dc491de81641c99ade9309f30c54ad0e28fbd"
+  integrity sha512-1lyT3TcaMJQe+OFfVI+TlomDkPuVzb27NZYdYtmSTltVmLaUjdCyt4KE+OH1CnhZKsz4/cdCL420Lg9UH5Z2Mw==
   dependencies:
+    "@smithy/types" "^2.4.0"
     tslib "^2.5.0"
 
-"@smithy/util-retry@^2.0.0":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@smithy/util-retry/-/util-retry-2.0.0.tgz#7ac5d5f12383a9d9b2a43f9ff25f3866c8727c24"
-  integrity sha512-/dvJ8afrElasuiiIttRJeoS2sy8YXpksQwiM/TcepqdRVp7u4ejd9C4IQURHNjlfPUT7Y6lCDSa2zQJbdHhVTg==
+"@smithy/util-retry@^2.0.5":
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/@smithy/util-retry/-/util-retry-2.0.5.tgz#1a93721da082301aca61d8b42380369761a7e80d"
+  integrity sha512-x3t1+MQAJ6QONk3GTbJNcugCFDVJ+Bkro5YqQQK1EyVesajNDqxFtCx9WdOFNGm/Cbm7tUdwVEmfKQOJoU2Vtw==
   dependencies:
-    "@smithy/service-error-classification" "^2.0.0"
+    "@smithy/service-error-classification" "^2.0.5"
+    "@smithy/types" "^2.4.0"
     tslib "^2.5.0"
 
-"@smithy/util-stream@^2.0.5":
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/@smithy/util-stream/-/util-stream-2.0.5.tgz#a59f6e5327dfa23c3302f578ea023674fc7fa42f"
-  integrity sha512-ylx27GwI05xLpYQ4hDIfS15vm+wYjNN0Sc2P0FxuzgRe8v0BOLHppGIQ+Bezcynk8C9nUzsUue3TmtRhjut43g==
+"@smithy/util-stream@^2.0.17":
+  version "2.0.17"
+  resolved "https://registry.yarnpkg.com/@smithy/util-stream/-/util-stream-2.0.17.tgz#4c980891b0943e9e64949d7afcf1ec4a7b510ea8"
+  integrity sha512-fP/ZQ27rRvHsqItds8yB7jerwMpZFTL3QqbQbidUiG0+mttMoKdP0ZqnvM8UK5q0/dfc3/pN7g4XKPXOU7oRWw==
   dependencies:
-    "@smithy/fetch-http-handler" "^2.0.5"
-    "@smithy/node-http-handler" "^2.0.5"
-    "@smithy/types" "^2.2.2"
+    "@smithy/fetch-http-handler" "^2.2.4"
+    "@smithy/node-http-handler" "^2.1.8"
+    "@smithy/types" "^2.4.0"
     "@smithy/util-base64" "^2.0.0"
     "@smithy/util-buffer-from" "^2.0.0"
     "@smithy/util-hex-encoding" "^2.0.0"
@@ -5498,13 +5489,13 @@
     "@smithy/util-buffer-from" "^2.0.0"
     tslib "^2.5.0"
 
-"@smithy/util-waiter@^2.0.5":
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/@smithy/util-waiter/-/util-waiter-2.0.5.tgz#e42161e03c53cf6726dca049ad9a105ea0967435"
-  integrity sha512-1lkkUmI/bhaDX+LIT3RiUNAn+NzPmsWjE7beMq0oQ3H1/CffaILIN67riDA0aE1YBj6xll7uWMIy4tJqc+peXw==
+"@smithy/util-waiter@^2.0.12":
+  version "2.0.12"
+  resolved "https://registry.yarnpkg.com/@smithy/util-waiter/-/util-waiter-2.0.12.tgz#a7348f9fd2bade5f2f3ee7ecf7c43ab86ed244ee"
+  integrity sha512-3sENmyVa1NnOPoiT2NCApPmu7ukP7S/v7kL9IxNmnygkDldn7/yK0TP42oPJLwB2k3mospNsSePIlqdXEUyPHA==
   dependencies:
-    "@smithy/abort-controller" "^2.0.5"
-    "@smithy/types" "^2.2.2"
+    "@smithy/abort-controller" "^2.0.12"
+    "@smithy/types" "^2.4.0"
     tslib "^2.5.0"
 
 "@socket.io/component-emitter@~3.1.0":
@@ -7537,17 +7528,17 @@
   resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-2.0.0.tgz#f544a148d3ab35801c1f633a7441fd87c2e484bf"
   integrity sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==
 
-"@tryghost/adapter-base-cache@0.1.5":
-  version "0.1.5"
-  resolved "https://registry.yarnpkg.com/@tryghost/adapter-base-cache/-/adapter-base-cache-0.1.5.tgz#66021c4e3e92bc623c82728ab50ca497ac41f7ae"
-  integrity sha512-ZAG7Qzn0RioU6yde67T9cneRtoD1ZxGcjwH81DdbL8ZqiPi66bmPw5TVOiEiFnny2XSDsPuUgc4/PxFO/RfV0g==
+"@tryghost/adapter-base-cache@0.1.10":
+  version "0.1.10"
+  resolved "https://registry.yarnpkg.com/@tryghost/adapter-base-cache/-/adapter-base-cache-0.1.10.tgz#8ae27c65ae33f94b911de43ddae21703d1da52a3"
+  integrity sha512-Ns5zAIOLIVfcoJfPbqCMLOOct9JbGNKmkWgeSOJ9EdTxePsuGGOtW4BwAoqZqDgB/tgedAZ8VJMOpXXFOEWKuw==
 
-"@tryghost/admin-api-schema@4.5.1":
-  version "4.5.1"
-  resolved "https://registry.yarnpkg.com/@tryghost/admin-api-schema/-/admin-api-schema-4.5.1.tgz#0c82194b0f0634e8ea12b146f92e994eebd3b89b"
-  integrity sha512-LjDnpQSpc6ZmCd4pwoWl6iVorgh7kmbl68tJW5QagZZJorOGfV6y8LiRJssUxXWKKguP7Hxqq6TCfuxeCW7mtw==
+"@tryghost/admin-api-schema@4.5.3":
+  version "4.5.3"
+  resolved "https://registry.yarnpkg.com/@tryghost/admin-api-schema/-/admin-api-schema-4.5.3.tgz#212d7fc6f60c81c7e3982482b2902d9bcd95b70c"
+  integrity sha512-5ksepvrxNQyXqxzmVGpZmmMXghXCmc1SkX8WFc9sO9/VAFRiC2Z8UV8+UZjVKHKJSBdwyNRLDtwJIyNUZxViKA==
   dependencies:
-    "@tryghost/errors" "^1.0.0"
+    "@tryghost/errors" "^1.2.26"
     ajv "^6.12.6"
     lodash "^4.17.11"
 
@@ -7591,10 +7582,10 @@
     "@tryghost/debug" "^0.1.26"
     lodash "^4.17.21"
 
-"@tryghost/bookshelf-include-count@^0.3.8":
-  version "0.3.8"
-  resolved "https://registry.yarnpkg.com/@tryghost/bookshelf-include-count/-/bookshelf-include-count-0.3.8.tgz#14c008acb3245439b3bc6a1fc33beed9328e1069"
-  integrity sha512-LHqIiIQ1SCDO0UAVgbgB81qhUpxhILQquLiNoI3H6yeKmm9/ZuAGlUG6/yvQCgP4fu86hTYsn8j0J5efVJBW1A==
+"@tryghost/bookshelf-include-count@^0.3.9":
+  version "0.3.9"
+  resolved "https://registry.yarnpkg.com/@tryghost/bookshelf-include-count/-/bookshelf-include-count-0.3.9.tgz#55f1c8a0549fdf9aab9784022dd8610901b4583c"
+  integrity sha512-32VKcT8HFk6yTqJ0mV0qZrEvBGcNVxfRsnMztJyQzRMmETrXb6wHNRCPWfxAcbcD5chYx87oFiWzRYGDxP16aA==
   dependencies:
     "@tryghost/debug" "^0.1.26"
     lodash "^4.17.21"
@@ -7615,31 +7606,31 @@
     "@tryghost/tpl" "^0.1.26"
     lodash "^4.17.21"
 
-"@tryghost/bookshelf-plugins@0.6.10":
-  version "0.6.10"
-  resolved "https://registry.yarnpkg.com/@tryghost/bookshelf-plugins/-/bookshelf-plugins-0.6.10.tgz#f8185fc7081c729cb9896bf965a8a259beaf05e7"
-  integrity sha512-k/hlgMmoAn9IUwRT0J8o+YwjKmGvBBz80OEsJkyJ/0pCldxVzY8jsaT4dsYzzGKbx48Q2Pz5CR5X6At4SDA8rA==
+"@tryghost/bookshelf-plugins@0.6.11":
+  version "0.6.11"
+  resolved "https://registry.yarnpkg.com/@tryghost/bookshelf-plugins/-/bookshelf-plugins-0.6.11.tgz#ee7e83775fdf62ff81cb93f1d896139f54e08958"
+  integrity sha512-leqmZM22JYW5lIhQ7wJzdNGhdOIM4wGsnTRdhnWxqVLSwCAMJBNBf1ukTHVkzWbyq/r54du2XuCztkwT4KQoLA==
   dependencies:
     "@tryghost/bookshelf-collision" "^0.1.37"
     "@tryghost/bookshelf-custom-query" "^0.1.21"
     "@tryghost/bookshelf-eager-load" "^0.1.25"
     "@tryghost/bookshelf-filter" "^0.5.8"
     "@tryghost/bookshelf-has-posts" "^0.1.26"
-    "@tryghost/bookshelf-include-count" "^0.3.8"
+    "@tryghost/bookshelf-include-count" "^0.3.9"
     "@tryghost/bookshelf-order" "^0.1.21"
     "@tryghost/bookshelf-pagination" "^0.1.39"
     "@tryghost/bookshelf-search" "^0.1.21"
-    "@tryghost/bookshelf-transaction-events" "^0.2.8"
+    "@tryghost/bookshelf-transaction-events" "^0.2.9"
 
 "@tryghost/bookshelf-search@^0.1.21":
   version "0.1.21"
   resolved "https://registry.yarnpkg.com/@tryghost/bookshelf-search/-/bookshelf-search-0.1.21.tgz#4325b8dac5bc1724ab91a3c96edfe99c4854a5ad"
   integrity sha512-wertR9Oilx3kgXSDPO97qDuzvbsgFns5sx/eclFoE3UsCPShmTiokKeGY5/5XivDcacvffwySeNGE/2P2Glp2w==
 
-"@tryghost/bookshelf-transaction-events@^0.2.8":
-  version "0.2.8"
-  resolved "https://registry.yarnpkg.com/@tryghost/bookshelf-transaction-events/-/bookshelf-transaction-events-0.2.8.tgz#c331ef3f95afef091f69cdfcb7f4015e4bb43628"
-  integrity sha512-iIOXj4RffwNwXj+opFf5POrDMtwllIB1Y+7/KzLjKZymerBBATEnFLkwTMETIqdUAXLEBuG3C9prqyLgjjmSsg==
+"@tryghost/bookshelf-transaction-events@^0.2.9":
+  version "0.2.9"
+  resolved "https://registry.yarnpkg.com/@tryghost/bookshelf-transaction-events/-/bookshelf-transaction-events-0.2.9.tgz#05b7cbfb5f1cf5240bcaab222c86861543ae0019"
+  integrity sha512-wgsIc+if61OlZ9I+R1K3cqcS3oyjtgXHuAaEedDk0vM92hkzn+Ye/d3X9aLIkPXKl14jtEudAWZK4LQSkoWvrA==
 
 "@tryghost/bunyan-rotating-filestream@^0.0.7":
   version "0.0.7"
@@ -7648,17 +7639,18 @@
   dependencies:
     long-timeout "^0.1.1"
 
-"@tryghost/color-utils@0.1.24":
-  version "0.1.24"
-  resolved "https://registry.yarnpkg.com/@tryghost/color-utils/-/color-utils-0.1.24.tgz#485e67bcbaa7f86dc3dd1d16f87f863df6e2981a"
-  integrity sha512-AZmnAxhp8kxvYEWFUXoOWZp4qjNbteDnPKNUeRnvnETIdJeKroeIZpE8sA0ev4/pJS2zrNey1nhGNfbGt6WCrQ==
+"@tryghost/color-utils@0.2.0":
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/@tryghost/color-utils/-/color-utils-0.2.0.tgz#c8a2cf06ec9fb8a7b4ed9bcfc2a96b1237b58eda"
+  integrity sha512-wvv/JwZYV/sy8hoNcXo0xRezUqOV/YLki1OqKUbJGPhqhv9PXsyauezXOyB+lSbhccPvZCuGQRE571VNf1JCfQ==
   dependencies:
+    "@types/color" "3.0.2"
     color "^3.2.1"
 
-"@tryghost/config-url-helpers@1.0.6":
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/@tryghost/config-url-helpers/-/config-url-helpers-1.0.6.tgz#0f5193b26305fda48236094be69f0b4b44ee2b92"
-  integrity sha512-cf6JI6iTxOB8TWblJ2RPcBv7SqQwn41pC25wqkmGwStKPs9qYY/Kqr9Ekgw9vwXIqotfs9xwMGPZQzccbzL0ZA==
+"@tryghost/config-url-helpers@1.0.10":
+  version "1.0.10"
+  resolved "https://registry.yarnpkg.com/@tryghost/config-url-helpers/-/config-url-helpers-1.0.10.tgz#ddc84c11d7045dec2d36c476019b559bc72a30a7"
+  integrity sha512-Fl7sKDDY/AMC2NPZ9DMZsKMyZTpQGhTavNPg+8tLx2EAOdIeUfZ0B8CuXqizgAJaWcMd7CD8uYo74QnL8xwZMw==
 
 "@tryghost/config@^0.2.18":
   version "0.2.18"
@@ -7668,25 +7660,22 @@
     "@tryghost/root-utils" "^0.3.24"
     nconf "^0.12.0"
 
-"@tryghost/content-api@1.11.7":
-  version "1.11.7"
-  resolved "https://registry.yarnpkg.com/@tryghost/content-api/-/content-api-1.11.7.tgz#5b779a319f4af16f9687c49459e475c9ca607b2f"
-  integrity sha512-G6Ovb0LSnlvx/nVzNDYd5kMyMmsTjwdiOANRbh/NPgaNUHS5RdUbbhPpYFvD1Cdi8xoliowCaGorv5wxI3Wb2Q==
+"@tryghost/content-api@1.11.19":
+  version "1.11.19"
+  resolved "https://registry.yarnpkg.com/@tryghost/content-api/-/content-api-1.11.19.tgz#65ba27d0a9da1f39f977b9f951a0ba8e765fb3ce"
+  integrity sha512-u3rWD7poV6DoUD6/VbUmKPEDxiEgJvrGUsWaMinOH+tBCu9oD/BM/M4MPy8mWsK0SVKLkA4ohpAaYzufNMEUfg==
   dependencies:
-    axios "^0.27.0"
+    axios "^1.0.0"
 
 "@tryghost/database-info@0.3.17":
   version "0.3.17"
   resolved "https://registry.yarnpkg.com/@tryghost/database-info/-/database-info-0.3.17.tgz#e7344d9f9675dfc572a71eeace97ea0527a4a7c5"
   integrity sha512-9wFXQVsOlLlq+6lMx2P165mCjIT/4qjDqoeAt6ct5Uag6Yjy5TRqrtqMJ09Lo3XjIUCs5vERPZPTxtCNJQCGwQ==
 
-"@tryghost/debug@0.1.24":
-  version "0.1.24"
-  resolved "https://registry.yarnpkg.com/@tryghost/debug/-/debug-0.1.24.tgz#90ea467ab7bca847b89df642b0cbdfc5a8f15df6"
-  integrity sha512-jL3QH6/FAKGw3ZRw57fzknaHdiStomJl5oF+2smQdXZz30xcV9Sj841CD6pUprQ3Vsjub8FjupOFL6IQsuqLrg==
-  dependencies:
-    "@tryghost/root-utils" "^0.3.22"
-    debug "^4.3.1"
+"@tryghost/database-info@0.3.20":
+  version "0.3.20"
+  resolved "https://registry.yarnpkg.com/@tryghost/database-info/-/database-info-0.3.20.tgz#89bc878c2f8f5d31da55bf607f0c0c4aeaef503a"
+  integrity sha512-HDM6ateszdBdh0D2BDXG7UeDRrPv1a+es4jB9UgijLe+GRa/gM09plDFVX63HC/dDeN+apuwH5S6PCBvLY8n2g==
 
 "@tryghost/debug@0.1.26", "@tryghost/debug@^0.1.13", "@tryghost/debug@^0.1.26":
   version "0.1.26"
@@ -7696,7 +7685,7 @@
     "@tryghost/root-utils" "^0.3.24"
     debug "^4.3.1"
 
-"@tryghost/elasticsearch@^3.0.12", "@tryghost/elasticsearch@^3.0.15":
+"@tryghost/elasticsearch@^3.0.15":
   version "3.0.15"
   resolved "https://registry.yarnpkg.com/@tryghost/elasticsearch/-/elasticsearch-3.0.15.tgz#d4be60b79155d95de063e17ea90ff0151a0a35d9"
   integrity sha512-LoDGpr04xuAOIfLDCIEvXT6jJCRA1OmJUpKV2vA8TqYvzbWdiLBhwg+RMZ1QYdHT1TvwUIjch0F1Np7wPizrrg==
@@ -7705,10 +7694,10 @@
     "@tryghost/debug" "^0.1.26"
     split2 "4.2.0"
 
-"@tryghost/email-mock-receiver@0.3.1":
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/@tryghost/email-mock-receiver/-/email-mock-receiver-0.3.1.tgz#b69c6866f4880ec1be9bf16cfcb3907d8a98d447"
-  integrity sha512-mFKc0WXQK9UQyz1kGYnU4ggzlh0fpHvWnFzX2k7gWaqBhyfKLMjhgHN8vcphA7LcTtnehiq8JWofC5nNCdPGfA==
+"@tryghost/email-mock-receiver@0.3.2":
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/@tryghost/email-mock-receiver/-/email-mock-receiver-0.3.2.tgz#abd8086935a95a996b6c5c803478a9f81dcae19a"
+  integrity sha512-On5ighfXMlXNVCARidImrnrz1LrWlkxAyykeyZqeK/HlHyjr5g3+4KY2sdaTywWUBLbJXqc4ntXRPyXRB9fxOw==
 
 "@tryghost/ember-promise-modals@2.0.1":
   version "2.0.1"
@@ -7726,7 +7715,7 @@
     focus-trap "^6.7.2"
     postcss-preset-env "^7.3.1"
 
-"@tryghost/errors@1.2.25", "@tryghost/errors@1.2.26", "@tryghost/errors@^1.0.0", "@tryghost/errors@^1.2.1", "@tryghost/errors@^1.2.24", "@tryghost/errors@^1.2.26", "@tryghost/errors@^1.2.3":
+"@tryghost/errors@1.2.25", "@tryghost/errors@1.2.26", "@tryghost/errors@^1.2.26", "@tryghost/errors@^1.2.3":
   version "1.2.26"
   resolved "https://registry.yarnpkg.com/@tryghost/errors/-/errors-1.2.26.tgz#0d0503a51e681998421548fbddbdd7376384c457"
   integrity sha512-s/eynvVUiAhHP0HB7CPQs7qH7Pm1quJ2iUMTCuH7HV8LqiGoQFNc21/5R4lRv+2Jt3yf69UPCs/6G+kAgZipNw==
@@ -7744,33 +7733,26 @@
     cookiejar "^2.1.3"
     reqresnext "^1.7.0"
 
-"@tryghost/helpers@1.1.77":
-  version "1.1.77"
-  resolved "https://registry.yarnpkg.com/@tryghost/helpers/-/helpers-1.1.77.tgz#5a8e14f56a22118ed4423bf44696890651590d65"
-  integrity sha512-YFLvM8B1x66hKA3XrL3AtN9fakVcFIwykISNKqEru601vZKPOI+n8WK8o2MMMD7yhRt5Xq97w+YUoXHsaDcPOg==
+"@tryghost/helpers@1.1.88":
+  version "1.1.88"
+  resolved "https://registry.yarnpkg.com/@tryghost/helpers/-/helpers-1.1.88.tgz#f4ed3c0a163c5e641cb70f7d5f4f5ddc90874b19"
+  integrity sha512-OK6qQg3Rd+6Hw0uyFqxYPiQzVJAe7zw/uT6EwLKraL4DnV8ODfnSJzde6PMun9duOohQxOYXEYfakeKIX+mhiw==
   dependencies:
     lodash-es "^4.17.11"
 
-"@tryghost/helpers@1.1.82":
-  version "1.1.82"
-  resolved "https://registry.yarnpkg.com/@tryghost/helpers/-/helpers-1.1.82.tgz#eb39d2059453530a3a04f7b529ba1ffd72df2f06"
-  integrity sha512-qijAnvohu6D5MxWdDyz3+DDB4szwmoDkKGQ8y4k5cXDtV0Zk1jgqhGseJuvki16wbbALbFMlsV6ubaYOf/e9Ew==
+"@tryghost/html-to-mobiledoc@2.0.42":
+  version "2.0.42"
+  resolved "https://registry.yarnpkg.com/@tryghost/html-to-mobiledoc/-/html-to-mobiledoc-2.0.42.tgz#ebd0b84dca9df5cba9e42914f494f6a04ff7fafe"
+  integrity sha512-U9mp1O3iGGjVsj4e1hyO/LtoZYuFFrvwkXHidJ58vZkVq0l6U7BVXIcpyL0KSYsG5qrpdHlwuEaKXJcBD5KmYQ==
   dependencies:
-    lodash-es "^4.17.11"
-
-"@tryghost/html-to-mobiledoc@2.0.36":
-  version "2.0.36"
-  resolved "https://registry.yarnpkg.com/@tryghost/html-to-mobiledoc/-/html-to-mobiledoc-2.0.36.tgz#8457c75efb5e022e9ab6d8e1f14e9f3cca981ebb"
-  integrity sha512-AJo0FCn9qkUk76ol7W9jgP2HOPIbbeOSa4y6HBUtrIDNv5KOj4GOzgMso/gcqXoWckySyfckw47tBe+xDLTsXg==
-  dependencies:
-    "@tryghost/kg-parser-plugins" "^3.0.36"
+    "@tryghost/kg-parser-plugins" "^3.0.42"
     "@tryghost/mobiledoc-kit" "^0.12.4-ghost.1"
     jsdom "^22.0.0"
 
-"@tryghost/http-cache-utils@0.1.9":
-  version "0.1.9"
-  resolved "https://registry.yarnpkg.com/@tryghost/http-cache-utils/-/http-cache-utils-0.1.9.tgz#882ea71e93bd5342515232bfc46562db348c93c7"
-  integrity sha512-wtW+G23cUF6QR+9EoZlesUSscirg1+NuFTF1cCBotaDxVL5un4dY2aU64ZIEMXTCvy8fnBsre2UE4+XRzTubag==
+"@tryghost/http-cache-utils@0.1.11":
+  version "0.1.11"
+  resolved "https://registry.yarnpkg.com/@tryghost/http-cache-utils/-/http-cache-utils-0.1.11.tgz#9b09921828f4772ac26c6d55b438a59e776e2b04"
+  integrity sha512-PbUfViKtY0mxzOpC5Pdkx26R4jcYfWCvSWiTNIW2OG2k1CtE83nIRD/AanIcNMXxrRNnT/hdG9Yu3+gOhEqpmA==
 
 "@tryghost/http-stream@^0.1.25":
   version "0.1.25"
@@ -7780,15 +7762,15 @@
     "@tryghost/errors" "^1.2.26"
     "@tryghost/request" "^1.0.0"
 
-"@tryghost/image-transform@1.2.6":
-  version "1.2.6"
-  resolved "https://registry.yarnpkg.com/@tryghost/image-transform/-/image-transform-1.2.6.tgz#530c792a50853b1779ecb8e15bee8ea5d1d890ef"
-  integrity sha512-kxDJHRgCCvcnLopyDCq4XIarG9QfOout+/MMdue6cvwrd9QBFpjvmN6/quO9OoAz3++Av/ovh7e1QpZhC+sUnA==
+"@tryghost/image-transform@1.2.10":
+  version "1.2.10"
+  resolved "https://registry.yarnpkg.com/@tryghost/image-transform/-/image-transform-1.2.10.tgz#0aea78ba47056e28ca21da9f625da1f1b0ca6085"
+  integrity sha512-xSzivoo2ME4x/UsMT8UpX1kqQTFxzckzl7kVLfvgPsnsSpAOP3W5P5cEb5szptcTLwtZhs/8kCw331Sh9kBd+g==
   dependencies:
-    "@tryghost/errors" "^1.2.1"
+    "@tryghost/errors" "^1.2.26"
     fs-extra "^11.0.0"
   optionalDependencies:
-    sharp "^0.30.0"
+    sharp "^0.32.0"
 
 "@tryghost/jest-snapshot@^0.5.7":
   version "0.5.7"
@@ -7800,20 +7782,20 @@
     "@tryghost/errors" "^1.2.26"
     jest-snapshot "^29.0.0"
 
-"@tryghost/kg-card-factory@4.0.14":
-  version "4.0.14"
-  resolved "https://registry.yarnpkg.com/@tryghost/kg-card-factory/-/kg-card-factory-4.0.14.tgz#4fdbd7e45926f26c1b96c9f6315e9294e576cb4c"
-  integrity sha512-riIhtlHJhspvwf+9JATawIayNqzIdaZE3DEXoRwQF4Cbdyk3ksuNJ+w4iBo7cvSbQg6s30TZpjFHQ21W1AROzg==
+"@tryghost/kg-card-factory@4.0.15":
+  version "4.0.15"
+  resolved "https://registry.yarnpkg.com/@tryghost/kg-card-factory/-/kg-card-factory-4.0.15.tgz#9f5cd81add5a35b05b7502846eb6369aadfaf4af"
+  integrity sha512-E4lLTAbuT/qAwa08nNLe/6l+G5zFCq4/RLjO3nIoX8aivEAJ2sGFzpXlr3txY3tTowoaXI5q+GsifboY4R5QhQ==
 
-"@tryghost/kg-clean-basic-html@3.0.39", "@tryghost/kg-clean-basic-html@^3.0.36", "@tryghost/kg-clean-basic-html@^3.0.39":
-  version "3.0.39"
-  resolved "https://registry.yarnpkg.com/@tryghost/kg-clean-basic-html/-/kg-clean-basic-html-3.0.39.tgz#aedfa732e8ad85846d673352f0b8e4b519ab9638"
-  integrity sha512-47n/D1PrWoJgRP3R62fnJeVP7YEojnlm9Sf7vGKXG2wXIsxgwhBBI6r7D7euB/t3OsRrTp5t1LMksNwoyQoO0g==
+"@tryghost/kg-clean-basic-html@3.0.41", "@tryghost/kg-clean-basic-html@^3.0.41":
+  version "3.0.41"
+  resolved "https://registry.yarnpkg.com/@tryghost/kg-clean-basic-html/-/kg-clean-basic-html-3.0.41.tgz#e680adab4b6b880ced1963fd3cf900bb47656602"
+  integrity sha512-J7OD6be0daRSZXQyD85cZ810WHNzP85U5qCDOhk50JsTIv2cQfCS0u3ej1hQBcVX3YVBMgmxDkQBhXAb7GpHxw==
 
-"@tryghost/kg-converters@0.0.21":
-  version "0.0.21"
-  resolved "https://registry.yarnpkg.com/@tryghost/kg-converters/-/kg-converters-0.0.21.tgz#1e66ab6b199b296b4d4e71fd6c7e55e757b383da"
-  integrity sha512-t7ZXlUQITz3kXcNxyPUsCDX47mkvnjgpcB14Q44P1iwJYu8Gp5+i6BtoH6xHVYatJp0uEDEhKLMZKMjzNbi7mw==
+"@tryghost/kg-converters@0.0.22":
+  version "0.0.22"
+  resolved "https://registry.yarnpkg.com/@tryghost/kg-converters/-/kg-converters-0.0.22.tgz#3f95d9e71d2b5fa1083a45119cf22a8e755471c3"
+  integrity sha512-wxvlgRJuuskFu7zPOMQM6gAIk4R9I3gGKknM6oOvFCX2xi1Vlv2yO1U5786v2d+05ACN9SIj3fkg7Fe9WjC2tw==
   dependencies:
     lodash "^4.17.21"
 
@@ -7822,12 +7804,12 @@
   resolved "https://registry.yarnpkg.com/@tryghost/kg-default-atoms/-/kg-default-atoms-4.0.3.tgz#a565a08ee55736065154f435d51b392f9a15455d"
   integrity sha512-EZ43abMvUr7cV5aAD4w7OVUOtaGdfj4HpvQRkZkAqB7/S4prRl7dWIlatxiYX379AXQ+hjI+cSrw5UV0yHaRhA==
 
-"@tryghost/kg-default-cards@9.1.8":
-  version "9.1.8"
-  resolved "https://registry.yarnpkg.com/@tryghost/kg-default-cards/-/kg-default-cards-9.1.8.tgz#96100ffe923fab98de5b2403ae06d53bc4d2610c"
-  integrity sha512-zwopCvpcBb6YgbxfT5h/9zetntIVXJaoJFVYSvpONH5EIXA1sG76PdFnboZCigOIYAaFBm1jM16ogat9/wL1Jw==
+"@tryghost/kg-default-cards@9.1.9":
+  version "9.1.9"
+  resolved "https://registry.yarnpkg.com/@tryghost/kg-default-cards/-/kg-default-cards-9.1.9.tgz#46388d46ea9b05e001958116c93bf0e7720f65e6"
+  integrity sha512-VhhgwOKSfeBep0LlzIIqh2k7LIuaHkiD/4t75WKp7hG4tNhWj+NYMb0vQDnJtoVnNfeNVjor1zEAnDoHzf4rFQ==
   dependencies:
-    "@tryghost/kg-markdown-html-renderer" "^6.0.14"
+    "@tryghost/kg-markdown-html-renderer" "^6.0.15"
     "@tryghost/string" "^0.2.0"
     "@tryghost/url-utils" "^4.0.0"
     handlebars "^4.7.6"
@@ -7835,35 +7817,35 @@
     lodash "^4.17.21"
     luxon "^3.0.0"
 
-"@tryghost/kg-default-nodes@0.2.6", "@tryghost/kg-default-nodes@^0.2.6":
-  version "0.2.6"
-  resolved "https://registry.yarnpkg.com/@tryghost/kg-default-nodes/-/kg-default-nodes-0.2.6.tgz#bf388c9342e25fbe8899e9eb93369e27f813e914"
-  integrity sha512-XlKq0BKHZk4NPBq/uYTMwIzrV4GFSiDU7Lh+N/3ugVq6kscwItUHVYkwXu2Mv3eLKvr2x0XTaaR91bPkpDnOBg==
+"@tryghost/kg-default-nodes@0.2.8", "@tryghost/kg-default-nodes@^0.2.8":
+  version "0.2.8"
+  resolved "https://registry.yarnpkg.com/@tryghost/kg-default-nodes/-/kg-default-nodes-0.2.8.tgz#b6081dd47703d5ee42a219d8b73099b08a6872fb"
+  integrity sha512-inpzMNexnEmIVCX26vg+Vw6Xhxam5U5BDELAlNU/iiSWKOVrLfQBfcGTku3syRnf54fb8emCxlVSj3Z4/AbxGg==
   dependencies:
     "@lexical/rich-text" "^0.12.2"
-    "@tryghost/kg-clean-basic-html" "^3.0.39"
-    "@tryghost/kg-markdown-html-renderer" "^6.0.14"
+    "@tryghost/kg-clean-basic-html" "^3.0.41"
+    "@tryghost/kg-markdown-html-renderer" "^6.0.15"
     html-minifier "^4.0.0"
     jsdom "^22.0.0"
     lexical "^0.12.2"
     lodash "^4.17.21"
     luxon "^3.3.0"
 
-"@tryghost/kg-default-transforms@^0.0.3":
-  version "0.0.3"
-  resolved "https://registry.yarnpkg.com/@tryghost/kg-default-transforms/-/kg-default-transforms-0.0.3.tgz#7791f3912f32a8be63cf3d312c046bb0e5df36dc"
-  integrity sha512-YWYAWVUf83L2dmSGo37rxfmDYzBTSVfSXTGh9y2xm8f7ypCv/VnOIefXdtswYnxuyhP+/uZUyZOTzIM/xtQYhg==
+"@tryghost/kg-default-transforms@^0.0.5":
+  version "0.0.5"
+  resolved "https://registry.yarnpkg.com/@tryghost/kg-default-transforms/-/kg-default-transforms-0.0.5.tgz#fd5c68c301b3c5f2dffdfbb7ce1fbdbd3c9b1029"
+  integrity sha512-L7KniU5pQ8dM1jHzRme2FYlKFZL+dVSso073fGsg3pGKjPcgNHlOhGWxYPuzKXyr4IH4a1+7G2d1SoSlOx1H3A==
   dependencies:
     "@lexical/list" "^0.12.2"
     "@lexical/rich-text" "^0.12.2"
     "@lexical/utils" "^0.12.2"
-    "@tryghost/kg-default-nodes" "^0.2.6"
+    "@tryghost/kg-default-nodes" "^0.2.8"
     lexical "^0.12.2"
 
-"@tryghost/kg-html-to-lexical@0.1.7":
-  version "0.1.7"
-  resolved "https://registry.yarnpkg.com/@tryghost/kg-html-to-lexical/-/kg-html-to-lexical-0.1.7.tgz#92cc6f2f2f1caec91003eb6ca9f037994aa77342"
-  integrity sha512-7+j7JZlF8HWt0FYCCb7+xvmlDWnYQwnkw7+RYXW7Ud5gUeFEmkg2UW/JV0XDbFgCw5QEahaRbE22Yi0Erfy78g==
+"@tryghost/kg-html-to-lexical@0.1.9":
+  version "0.1.9"
+  resolved "https://registry.yarnpkg.com/@tryghost/kg-html-to-lexical/-/kg-html-to-lexical-0.1.9.tgz#22c8d5b69aa3d80102869e5ce5beafd1c07cae17"
+  integrity sha512-aLy3aEblCxQqKBcCsxfv8DxPHZkM6+tB1QLXrnHFBVTbHm8T3VIamDILcxbGnT93pPym5fh1+AwH7ZyX5TCWaw==
   dependencies:
     "@lexical/clipboard" "^0.12.2"
     "@lexical/headless" "^0.12.2"
@@ -7871,15 +7853,15 @@
     "@lexical/link" "^0.12.2"
     "@lexical/list" "^0.12.2"
     "@lexical/rich-text" "^0.12.2"
-    "@tryghost/kg-default-nodes" "^0.2.6"
-    "@tryghost/kg-default-transforms" "^0.0.3"
+    "@tryghost/kg-default-nodes" "^0.2.8"
+    "@tryghost/kg-default-transforms" "^0.0.5"
     jsdom "^22.1.0"
     lexical "^0.12.2"
 
-"@tryghost/kg-lexical-html-renderer@0.3.42":
-  version "0.3.42"
-  resolved "https://registry.yarnpkg.com/@tryghost/kg-lexical-html-renderer/-/kg-lexical-html-renderer-0.3.42.tgz#d433ab4af404d92e534f2cf25630aa338d1c81a5"
-  integrity sha512-j8QlbJDn5oIfoN+5rHLwrrfkXs1KhNuS0y8WvmA2tUq5N4XgLQvGbsEf9/E0cIs2t2CDSjfZjLx5tqXE7gw9/w==
+"@tryghost/kg-lexical-html-renderer@0.3.45":
+  version "0.3.45"
+  resolved "https://registry.yarnpkg.com/@tryghost/kg-lexical-html-renderer/-/kg-lexical-html-renderer-0.3.45.tgz#ca8d487b70828aba8c6bcbad82d9c5bf3f823320"
+  integrity sha512-c3fvn2BWZY9zfBNqusQq443KyQS+6LrSmFh2i1I8HlHu+CcUIM7cbljqYGHrBVq/n13zMWWw25oioxbjQDA0uw==
   dependencies:
     "@lexical/clipboard" "^0.12.2"
     "@lexical/code" "^0.12.2"
@@ -7887,17 +7869,17 @@
     "@lexical/link" "^0.12.2"
     "@lexical/list" "^0.12.2"
     "@lexical/rich-text" "^0.12.2"
-    "@tryghost/kg-default-nodes" "^0.2.6"
+    "@tryghost/kg-default-nodes" "^0.2.8"
     jsdom "^22.1.0"
     lexical "^0.12.2"
     prettier "^3.0.0"
 
-"@tryghost/kg-markdown-html-renderer@^6.0.14":
-  version "6.0.14"
-  resolved "https://registry.yarnpkg.com/@tryghost/kg-markdown-html-renderer/-/kg-markdown-html-renderer-6.0.14.tgz#eef03122e0a4919d370398c02727300cd93f2988"
-  integrity sha512-Cnxi5Ucn3o98o0pkJAVcJ2+h8lPf9uLi0x3Hq0INJV79f2fch28ILW6wQCbF052j52btFCf58a5dJBT1uqtiEg==
+"@tryghost/kg-markdown-html-renderer@^6.0.15":
+  version "6.0.15"
+  resolved "https://registry.yarnpkg.com/@tryghost/kg-markdown-html-renderer/-/kg-markdown-html-renderer-6.0.15.tgz#ff314cad10d17ef87c201471066e158986c524d1"
+  integrity sha512-kK18d/Ert9QDU5aXUrv3C36RzwX3JHz8MlXYiVR4tpmiPgTa8r6bBMuUFkXQQjvP6P8+tJXDLaSMgFiF0Su8yg==
   dependencies:
-    "@tryghost/kg-utils" "^1.0.22"
+    "@tryghost/kg-utils" "^1.0.23"
     markdown-it "^13.0.0"
     markdown-it-footnote "^3.0.3"
     markdown-it-image-lazy-loading "^1.1.0"
@@ -7907,38 +7889,38 @@
     markdown-it-sup "^1.0.0"
     semver "^7.3.5"
 
-"@tryghost/kg-mobiledoc-html-renderer@6.0.14":
-  version "6.0.14"
-  resolved "https://registry.yarnpkg.com/@tryghost/kg-mobiledoc-html-renderer/-/kg-mobiledoc-html-renderer-6.0.14.tgz#6cf06c29c99dc017946dd5bf1f7470cf12638cb6"
-  integrity sha512-gru9sCZPiOSgCGSCI9i1LEXxkpOJBmEuEVb0RUzOA+ftzPDfPiYCpSjyy4ykJ7ZWxbAZyBgDqiuBEguE1e9/mg==
+"@tryghost/kg-mobiledoc-html-renderer@6.0.15":
+  version "6.0.15"
+  resolved "https://registry.yarnpkg.com/@tryghost/kg-mobiledoc-html-renderer/-/kg-mobiledoc-html-renderer-6.0.15.tgz#17fe6bb92393e0f559b9f45dd51320147ed032a3"
+  integrity sha512-CbbnkWyxmM0T4gyKKBvPWrhG+HV3CY/KhOKnzbIGmzOWOaFJw96MiJL0V8Sfnq0nu0bwKoD/2LGKn0RcAHOdFQ==
   dependencies:
-    "@tryghost/kg-utils" "^1.0.22"
+    "@tryghost/kg-utils" "^1.0.23"
     mobiledoc-dom-renderer "^0.7.0"
     simple-dom "^1.4.0"
 
-"@tryghost/kg-parser-plugins@^3.0.36":
-  version "3.0.37"
-  resolved "https://registry.yarnpkg.com/@tryghost/kg-parser-plugins/-/kg-parser-plugins-3.0.37.tgz#202c2726906099709209db3cc3da8d887e65fca8"
-  integrity sha512-lfg75fcauy5icI0n+j6zTpoawYTtYP8jCYgvHq1Sg+zRY+90y9JeknLSo85hQz6nO8kP/RJvhGZ4tg9Gv3DynQ==
+"@tryghost/kg-parser-plugins@^3.0.42":
+  version "3.0.42"
+  resolved "https://registry.yarnpkg.com/@tryghost/kg-parser-plugins/-/kg-parser-plugins-3.0.42.tgz#82044ab8f500e30e2c605317f32b626f272cefe0"
+  integrity sha512-2QhoKyI0KaW0khQvZpJxter448GO7wX4pXxuPjek4wsuo05UeM/osc9I67JiIB9/XP3qfQol15JLuzf360432Q==
   dependencies:
-    "@tryghost/kg-clean-basic-html" "^3.0.36"
+    "@tryghost/kg-clean-basic-html" "^3.0.41"
 
-"@tryghost/kg-utils@^1.0.22":
-  version "1.0.22"
-  resolved "https://registry.yarnpkg.com/@tryghost/kg-utils/-/kg-utils-1.0.22.tgz#bb24bcd7c97e5b2c46221d4a383160ea37926af5"
-  integrity sha512-glHSKw3+W6IeT1TIXJQuRXhlJhFIeSwRbbvFSG+3sSikeOHAR1boKXWeKRRnaGAwqOvJFvcwSD89BOhA7DNXGg==
+"@tryghost/kg-utils@^1.0.23":
+  version "1.0.23"
+  resolved "https://registry.yarnpkg.com/@tryghost/kg-utils/-/kg-utils-1.0.23.tgz#89b45da20e51907e8b17c0f0aa7dc5613118ba32"
+  integrity sha512-Om2U7eeKPIZarGP9FLuhkW/0oIFdY/uWX2CI2BAsbWEp9zlH2at6ydC9vaLxYgVc7P2nGmK9sw2w9xWh3nz3EQ==
   dependencies:
     semver "^7.3.5"
 
-"@tryghost/koenig-lexical@0.5.12":
-  version "0.5.12"
-  resolved "https://registry.yarnpkg.com/@tryghost/koenig-lexical/-/koenig-lexical-0.5.12.tgz#36e03a3d007dc71b243be1d81fcb1125e4f53970"
-  integrity sha512-9hLhQ/6X7OlicMkGqPdsY6PBu7RaZntSlLHGgIp48dxU8lzQOKk2Nycrrvv+3DdR9Bzk79mmEWrj7vx2g9ggdw==
+"@tryghost/koenig-lexical@0.5.17":
+  version "0.5.17"
+  resolved "https://registry.yarnpkg.com/@tryghost/koenig-lexical/-/koenig-lexical-0.5.17.tgz#fc1d067c8392e9248d9b3fd76103c51ff997d34f"
+  integrity sha512-G0M0VfHytFm2m2D5xkdAY/1C3E6aYwqyXYQ5rnyXheMC7jjIienniWhrx+xfYhkt1g2WIQ+OrmbDQ4ZkF6ZfIA==
 
-"@tryghost/limit-service@1.2.10", "@tryghost/limit-service@^1.2.10":
-  version "1.2.10"
-  resolved "https://registry.yarnpkg.com/@tryghost/limit-service/-/limit-service-1.2.10.tgz#9e1c8b21eddc3de8c5b8a9b029ba4915ec1ac625"
-  integrity sha512-Spnlkf7uQqwmfy5npkrwWJCcNN3II5oQiyQPy8QhhVk/UlLvzpTpYneHBJmIn4mFRxKrWC7xzSXIRMlb13ClBA==
+"@tryghost/limit-service@1.2.12", "@tryghost/limit-service@^1.2.10":
+  version "1.2.12"
+  resolved "https://registry.yarnpkg.com/@tryghost/limit-service/-/limit-service-1.2.12.tgz#f6cfd592cd0ca26b9d81c02f3e5455426dd00789"
+  integrity sha512-CoUzuzwhFFxiSHGeUPzm7ku1xuDoC9Gygm4DjzTUPLgQSpiEnz64TrMqJBjxYpV9Jc0PV47GEya5wIdlsPdEvg==
   dependencies:
     "@tryghost/errors" "^1.2.26"
     lodash "^4.17.21"
@@ -7961,14 +7943,14 @@
     json-stringify-safe "^5.0.1"
     lodash "^4.17.21"
 
-"@tryghost/metrics@1.0.24":
-  version "1.0.24"
-  resolved "https://registry.yarnpkg.com/@tryghost/metrics/-/metrics-1.0.24.tgz#d1aad748a4d0ca71ce7a78fd926ff0fdf44e95b3"
-  integrity sha512-8mVD/2LiciIGKM2yh5ne87oTK2aa7FJNYMf2p6THKdS07wEJZzV3KT+cRnwaSznwBdJqyHTWQPXJ7XNaw+Spdg==
+"@tryghost/metrics@1.0.27":
+  version "1.0.27"
+  resolved "https://registry.yarnpkg.com/@tryghost/metrics/-/metrics-1.0.27.tgz#00713047bf4592a26a83e4b9bb05eb41f103ab91"
+  integrity sha512-aOS+YljlSw6CSN7JZX8AVtSgSgrOfjxdDeGkSAyzNfj+7t/A7+Vf4lpKyblA3MtL54VVL2cXSZ5LcHnz7c2jEA==
   dependencies:
-    "@tryghost/elasticsearch" "^3.0.12"
-    "@tryghost/pretty-stream" "^0.1.18"
-    "@tryghost/root-utils" "^0.3.22"
+    "@tryghost/elasticsearch" "^3.0.15"
+    "@tryghost/pretty-stream" "^0.1.20"
+    "@tryghost/root-utils" "^0.3.24"
     json-stringify-safe "^5.0.1"
   optionalDependencies:
     promise.allsettled "^1.0.5"
@@ -7996,13 +7978,13 @@
   dependencies:
     lodash "^4.17.11"
 
-"@tryghost/nodemailer@0.3.35":
-  version "0.3.35"
-  resolved "https://registry.yarnpkg.com/@tryghost/nodemailer/-/nodemailer-0.3.35.tgz#b03248783afc60dc5baf965051b932639264d873"
-  integrity sha512-dz1P36m64a75bZRvjkq3f6khxFBugmb8olFUFSZJOuj2eYuuJ6aoBKBmJvcERBOIt/g6dwQ81NJqZipn+66SOg==
+"@tryghost/nodemailer@0.3.37":
+  version "0.3.37"
+  resolved "https://registry.yarnpkg.com/@tryghost/nodemailer/-/nodemailer-0.3.37.tgz#f8766fdc176fec1e5fcfad1ed3c137702f247c83"
+  integrity sha512-rav7IaXvGw14Z3B5nj9tMpFiCVxivshjGM9C0H5B/JZdHkaLd/5mqjpJM66ZnjusxGipUwMPaxGSnFWYB2SOvg==
   dependencies:
     "@aws-sdk/client-ses" "^3.31.0"
-    "@tryghost/errors" "^1.2.24"
+    "@tryghost/errors" "^1.2.26"
     nodemailer "^6.6.3"
     nodemailer-direct-transport "^3.3.2"
     nodemailer-mailgun-transport "^2.1.5"
@@ -8025,15 +8007,7 @@
     "@tryghost/nql-lang" "^0.5.0"
     mingo "^2.2.2"
 
-"@tryghost/pretty-cli@1.2.36":
-  version "1.2.36"
-  resolved "https://registry.yarnpkg.com/@tryghost/pretty-cli/-/pretty-cli-1.2.36.tgz#ea4466214bb99c5d192e40bfa947448d3b058cb1"
-  integrity sha512-Bxnzou/BiMS+Kz3SaRwcVrxbnbqu3XYkXjAorZKy9eKJ26OXQ4F1TC8oLS1aByOLz1QgqjOgzTytwjSxNyfXAQ==
-  dependencies:
-    chalk "^4.1.0"
-    sywac "^1.3.0"
-
-"@tryghost/pretty-cli@^1.2.38":
+"@tryghost/pretty-cli@1.2.38", "@tryghost/pretty-cli@^1.2.38":
   version "1.2.38"
   resolved "https://registry.yarnpkg.com/@tryghost/pretty-cli/-/pretty-cli-1.2.38.tgz#a2844f504dfd841f9f0552769ec3f62239433eca"
   integrity sha512-hGzFdJT4+Z77LWv+CPFwt36jE6JjXg/YGV+IkM1YvE7qNL5UL4hTNdi0M4hy8d19SICY9Ob1UYuKZLWhY5fd4w==
@@ -8041,7 +8015,7 @@
     chalk "^4.1.0"
     sywac "^1.3.0"
 
-"@tryghost/pretty-stream@^0.1.18", "@tryghost/pretty-stream@^0.1.20":
+"@tryghost/pretty-stream@^0.1.20":
   version "0.1.20"
   resolved "https://registry.yarnpkg.com/@tryghost/pretty-stream/-/pretty-stream-0.1.20.tgz#cccb2173cde85f450895777edf79d94cb712db74"
   integrity sha512-2fWRvTUrnbD/AnDChyZ0ZwUWdqRg2dsoa+DZxfH9hJNAwCDAMgp1qVEoOCwMMB1YYDWKKsYM/i+xoxDueMwyLA==
@@ -8050,10 +8024,10 @@
     moment "^2.29.1"
     prettyjson "^1.2.5"
 
-"@tryghost/promise@0.3.4":
-  version "0.3.4"
-  resolved "https://registry.yarnpkg.com/@tryghost/promise/-/promise-0.3.4.tgz#b5437eb14a3d06e7d32f277e10975ff77061e16e"
-  integrity sha512-D8zxDpLuPfPjakMTj7o2dpcdi+luwC6ibQLDy6Z0ImQtBt4wZEbmAH1eAsYpk4JVviuGWzwkOM1cURmMEJO5Ig==
+"@tryghost/promise@0.3.6":
+  version "0.3.6"
+  resolved "https://registry.yarnpkg.com/@tryghost/promise/-/promise-0.3.6.tgz#b6b36442100564eab3d3de46595646722754113c"
+  integrity sha512-ZCNc3GUxMd8A7PXKso1s3kCfQfXZgm+e7TCZ2bog/mfpU08EHWVOnAeRTygzlbooTTxTRsqUnMfaXnD5ZyOAdw==
 
 "@tryghost/request@1.0.0", "@tryghost/request@^1.0.0":
   version "1.0.0"
@@ -8067,15 +8041,7 @@
     got "13.0.0"
     lodash "^4.17.21"
 
-"@tryghost/root-utils@0.3.22":
-  version "0.3.22"
-  resolved "https://registry.yarnpkg.com/@tryghost/root-utils/-/root-utils-0.3.22.tgz#23793e467afb41b27f4e289a3618d71bd90bc575"
-  integrity sha512-vA9zdwlS3nPISTptr94/9psgxcISZ0tB8SoT4HxtPif2wjYgfvSDPJCBaVh1TKXhFZAxcwQSedQElK2XoIs83g==
-  dependencies:
-    caller "^1.0.1"
-    find-root "^1.1.0"
-
-"@tryghost/root-utils@^0.3.22", "@tryghost/root-utils@^0.3.24":
+"@tryghost/root-utils@0.3.24", "@tryghost/root-utils@^0.3.24":
   version "0.3.24"
   resolved "https://registry.yarnpkg.com/@tryghost/root-utils/-/root-utils-0.3.24.tgz#91653fbadc882fb8510844f163a2231c87f30fab"
   integrity sha512-EzYM3dR/3xyvJHm37RumiIzeGEBRwnnQtQzswXpzn46Rooz7PA7NSjUbLZ8j2K3t0ee+CsPNuyzmzZl+Ih1P2g==
@@ -8091,87 +8057,44 @@
     "@tryghost/debug" "^0.1.26"
     "@tryghost/logging" "^2.4.7"
 
-"@tryghost/social-urls@0.1.36":
-  version "0.1.36"
-  resolved "https://registry.yarnpkg.com/@tryghost/social-urls/-/social-urls-0.1.36.tgz#1ab1e083d439c45b6df43e32adf045738c606158"
-  integrity sha512-Xg9wljbS7HrsWyK/VBVUbYnmTX7Mc8gF6ix+UlIbbtqk4jUdCxF2w76bZc9Ff+SiE6DQtuT5m6HmSeR1YGKLYg==
-
-"@tryghost/string@0.2.4":
-  version "0.2.4"
-  resolved "https://registry.yarnpkg.com/@tryghost/string/-/string-0.2.4.tgz#bcf90a5b278dd5c763a900fdb19be045e1ad81d9"
-  integrity sha512-O8gOrZhWo7djxCOss75vtGrninjZk989aWdry4zosHRZqIT5bEbAQbOpBLIa2Zc5BfmHIVZmuVb1Nj6h3+8p6w==
-  dependencies:
-    unidecode "^0.1.8"
+"@tryghost/social-urls@0.1.41":
+  version "0.1.41"
+  resolved "https://registry.yarnpkg.com/@tryghost/social-urls/-/social-urls-0.1.41.tgz#3f57ff1e184b7d1ccd9a4e90e2ddb0d61750d296"
+  integrity sha512-blWlifsoWAlttnmPspJyZE/3UHjCVc1VXqI8f/GSbi+l7d05ndLErAS18L4PQqRVUWibK12Zh2rd4WInExGEOw==
 
-"@tryghost/string@^0.2.0":
-  version "0.2.6"
-  resolved "https://registry.yarnpkg.com/@tryghost/string/-/string-0.2.6.tgz#59e15a28821992b780eaad33d06ffb9073a9ca5a"
-  integrity sha512-ZzrpySEDa6wZ3/VIMCOpYJCuwLnBh5+4gFVNzEx5raSnwIpNHvi+SplXroILk/GftsAemnKdEDIbHiaF40W4Gg==
+"@tryghost/string@0.2.10", "@tryghost/string@^0.2.0":
+  version "0.2.10"
+  resolved "https://registry.yarnpkg.com/@tryghost/string/-/string-0.2.10.tgz#0519a36a4c402a409a071bc2f474b763f8a20788"
+  integrity sha512-bju3GUWu4qjp+0SF6ubYK9QXUgntiZ88PXLpU25IlfiZCKKx4r4MQ5T46dGI+LrEoidSR8uTldjpaAnMzuXFoQ==
   dependencies:
     unidecode "^0.1.8"
 
-"@tryghost/timezone-data@0.3.8":
-  version "0.3.8"
-  resolved "https://registry.yarnpkg.com/@tryghost/timezone-data/-/timezone-data-0.3.8.tgz#413f8c7efa972bbdb186d95f4eab8d2799704010"
-  integrity sha512-0CkCR6uRwANHvP8BJ/3EPPw4Z55u+WCBFM/+KR2KGCogGQwx8npIDA0zWUyWzKk+Y2Z9IqoHs+IlaA1v3t+Jdw==
-
-"@tryghost/tpl@0.1.24":
-  version "0.1.24"
-  resolved "https://registry.yarnpkg.com/@tryghost/tpl/-/tpl-0.1.24.tgz#fcf585be02531baf651f2f7605466a3df744d0bc"
-  integrity sha512-8DkKSCUuoGmagQ+LeiICt7mTC12HJdBIBhgK/zmOE/QKdl95G0y1mZuyc7dRaUyoXAwTj5EF+MR8gWOtuLdAEw==
-  dependencies:
-    lodash.template "^4.5.0"
-
-"@tryghost/tpl@0.1.25":
-  version "0.1.25"
-  resolved "https://registry.yarnpkg.com/@tryghost/tpl/-/tpl-0.1.25.tgz#500a05a2fce936ee785347259c4a8952223dea90"
-  integrity sha512-E4lLVhTNZn67TbOg94HHhW8lndgwP+G9yTDzTKXFabEB5zgfjaX4qBkJJvS0DO8RWMsO8O4c10/cQQpKXQrFBg==
-  dependencies:
-    lodash.template "^4.5.0"
+"@tryghost/timezone-data@0.4.1":
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/@tryghost/timezone-data/-/timezone-data-0.4.1.tgz#67f648f8aeb7da565df7c96bf91bac66de0a7af2"
+  integrity sha512-jIUlJG1Yvv013HORnxOm5ucY+a0EPQ7YLudXUOpmUGU+ctVsubctzHd0Sn+ZIHm8x3wFJKjBSiu9ThtirEZM8g==
 
-"@tryghost/tpl@^0.1.24", "@tryghost/tpl@^0.1.26":
+"@tryghost/tpl@0.1.26", "@tryghost/tpl@^0.1.26":
   version "0.1.26"
   resolved "https://registry.yarnpkg.com/@tryghost/tpl/-/tpl-0.1.26.tgz#5a7a67a9f0e8ff730b0e9af579b73a64bb34251c"
   integrity sha512-ofM8EYMktK/7VRsOG6TKF+ObShGsme7lPZ+/9YBVlrHzWiFSR+sG1x+qBIlmPXpDVk9nGt4OAOX4rpdZ2B9PpA==
   dependencies:
     lodash.template "^4.5.0"
 
-"@tryghost/url-utils@4.4.0":
-  version "4.4.0"
-  resolved "https://registry.yarnpkg.com/@tryghost/url-utils/-/url-utils-4.4.0.tgz#3f2e0c50ddec49f9c90f6d611eddce51185e6cad"
-  integrity sha512-MS5K+fgPdjMpbuo1NMIE38x1DXotRsgJRxRBy1noiTjFV3o7VLQVd7PYC3KZY+N0qKFAzwPSaAPOzlumIK/UBA==
-  dependencies:
-    cheerio "^0.22.0"
-    moment "^2.27.0"
-    moment-timezone "^0.5.31"
-    remark "^11.0.2"
-    remark-footnotes "^1.0.0"
-    unist-util-visit "^2.0.0"
-
-"@tryghost/url-utils@^4.0.0":
-  version "4.4.2"
-  resolved "https://registry.yarnpkg.com/@tryghost/url-utils/-/url-utils-4.4.2.tgz#3461c65f00e1167ff479da15bfabcbb4d2a82163"
-  integrity sha512-UDaPjAX3VWUvj9zSqWe4nMhfNsXpg32R9h1QpXH0N4jw4gBj7Y54pCRZmQ6NjKxHrL66sX0mJWYxd/2LVdusag==
+"@tryghost/url-utils@4.4.6", "@tryghost/url-utils@^4.0.0":
+  version "4.4.6"
+  resolved "https://registry.yarnpkg.com/@tryghost/url-utils/-/url-utils-4.4.6.tgz#4938e55fcc11620fd17c64346249d420f6f97129"
+  integrity sha512-ceUJsCXow3itfKSDyFxUsggbFc5o5mMKzrI4D33SHN41CMU27ELSQPYZjTU2oG2VBsd2qBBo94+1sWPFyGseww==
   dependencies:
     cheerio "^0.22.0"
+    lodash "^4.17.21"
     moment "^2.27.0"
     moment-timezone "^0.5.31"
     remark "^11.0.2"
     remark-footnotes "^1.0.0"
     unist-util-visit "^2.0.0"
 
-"@tryghost/validator@0.2.4":
-  version "0.2.4"
-  resolved "https://registry.yarnpkg.com/@tryghost/validator/-/validator-0.2.4.tgz#75322a46f16b033ae27ea0839231ef0a3bc434f6"
-  integrity sha512-KhAauvyyebf++bveqgwTiphVzLQrupdWLP8zOWASqRDpKR3x+ztJDm1oy9F2aVQTvhxFq5Gwfwhg6+uZncx7pQ==
-  dependencies:
-    "@tryghost/errors" "^1.2.24"
-    "@tryghost/tpl" "^0.1.24"
-    lodash "^4.17.21"
-    moment-timezone "^0.5.23"
-    validator "7.2.0"
-
-"@tryghost/validator@^0.2.6":
+"@tryghost/validator@0.2.6", "@tryghost/validator@^0.2.6":
   version "0.2.6"
   resolved "https://registry.yarnpkg.com/@tryghost/validator/-/validator-0.2.6.tgz#99a01bf6e6c70c1eb79098e6b95b980e0efa126b"
   integrity sha512-2p1/X7vqI/tikc2beRQ1efCm/hSRCkB7y0+etCGROKNH3nHJwvw+OKSxgmNZ7+5OjR6DJkNW88aMYPz47X3fAg==
@@ -8182,15 +8105,7 @@
     moment-timezone "^0.5.23"
     validator "7.2.0"
 
-"@tryghost/version@0.1.22":
-  version "0.1.22"
-  resolved "https://registry.yarnpkg.com/@tryghost/version/-/version-0.1.22.tgz#e2a9f6eec4f9f8945094d3bd7c0757438f4e0622"
-  integrity sha512-LpOglcRlwE9auw+OIIN32DWMc2Xr4I57SzIxfXm+AEZWz/lSrBN/3UCb1CyLAWptdEoKKszX7VVa7gZO66A5wg==
-  dependencies:
-    "@tryghost/root-utils" "^0.3.22"
-    semver "^7.3.5"
-
-"@tryghost/version@^0.1.24":
+"@tryghost/version@0.1.24", "@tryghost/version@^0.1.24":
   version "0.1.24"
   resolved "https://registry.yarnpkg.com/@tryghost/version/-/version-0.1.24.tgz#eb8bc345929ba8f67c3f36757bd91c12f701a5f5"
   integrity sha512-XM0aXB3dQNjazeMX5YbBLjA+airE5HR5XqmEB9YrAxlQPaYdXkQUq+ar6L/dxiS8dp+o2DQIcp2XgGd/Ay3MuQ==
@@ -8198,10 +8113,10 @@
     "@tryghost/root-utils" "^0.3.24"
     semver "^7.3.5"
 
-"@tryghost/webhook-mock-receiver@0.2.6":
-  version "0.2.6"
-  resolved "https://registry.yarnpkg.com/@tryghost/webhook-mock-receiver/-/webhook-mock-receiver-0.2.6.tgz#20a4141f5813287988770f5f1e394ad2af5c1063"
-  integrity sha512-OB+6Wx2yoAafOe4/GEy3X1KEnNPysvijkZTDyZRjbs9qFA1gJ0IdxWL/oyoX4HgVuGDuVr/LM83zomsM5YUtBQ==
+"@tryghost/webhook-mock-receiver@0.2.8":
+  version "0.2.8"
+  resolved "https://registry.yarnpkg.com/@tryghost/webhook-mock-receiver/-/webhook-mock-receiver-0.2.8.tgz#1cb3bb5de667f597f2eaa25aff3e9e572212cafa"
+  integrity sha512-xEzooRTnZVlzeTalYbdGWwmJ4GJ9RKcPcn4x2vt/9Mogm6E23xc+vQEAUtfaKAQPpXHDf+S2glXMOJ8S0MQCCw==
   dependencies:
     p-wait-for "3.2.0"
 
@@ -8251,10 +8166,10 @@
   resolved "https://registry.yarnpkg.com/@types/aria-query/-/aria-query-5.0.1.tgz#3286741fb8f1e1580ac28784add4c7a1d49bdfbc"
   integrity sha512-XTIieEY+gvJ39ChLcB4If5zHtPxt3Syj5rgZR+e1ctpmK8NjPf0zFqsz4JpLJT0xla9GFDKjy8Cpu331nrmE1Q==
 
-"@types/babel__core@^7.0.0", "@types/babel__core@^7.20.2":
-  version "7.20.2"
-  resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.20.2.tgz#215db4f4a35d710256579784a548907237728756"
-  integrity sha512-pNpr1T1xLUc2l3xJKuPtsEky3ybxN3m4fJkknfIpTCTfIZCDW57oAg+EfCgIIp2rvCe0Wn++/FfodDS4YXxBwA==
+"@types/babel__core@^7.0.0", "@types/babel__core@^7.20.3":
+  version "7.20.3"
+  resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.20.3.tgz#d5625a50b6f18244425a1359a858c73d70340778"
+  integrity sha512-54fjTSeSHwfan8AyHWrKbfBWiEUrNTZsUwPTDSNaaP1QDQIZbeNUg3a59E9D+375MzUw/x1vx2/0F5LBz+AeYA==
   dependencies:
     "@babel/parser" "^7.20.7"
     "@babel/types" "^7.20.7"
@@ -8326,10 +8241,29 @@
   resolved "https://registry.yarnpkg.com/@types/chai/-/chai-4.3.5.tgz#ae69bcbb1bebb68c4ac0b11e9d8ed04526b3562b"
   integrity sha512-mEo1sAde+UCE6b2hxn332f1g1E8WfYRu6p5SvTKr2ZKC1f7gFJXk4h5PyGP9Dt6gCaG8y8XhwnXWC6Iy2cmBng==
 
-"@types/common-tags@1.8.2":
-  version "1.8.2"
-  resolved "https://registry.yarnpkg.com/@types/common-tags/-/common-tags-1.8.2.tgz#04a2fed0597d18b6eb5eb9d24b62905041c572c9"
-  integrity sha512-Z5UcOnlqxFm0tCCTEhkcVOfSihWOMyKypIWHtQNSYh6fMdPUIVpNdLBYutDpDXVHsMUrYzI2IczUHXIzpUovmQ==
+"@types/color-convert@*":
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/@types/color-convert/-/color-convert-2.0.2.tgz#a5fa5da9b866732f8bf86b01964869011e2a2356"
+  integrity sha512-KGRIgCxwcgazts4MXRCikPbIMzBpjfdgEZSy8TRHU/gtg+f9sOfHdtK8unPfxIoBtyd2aTTwINVLSNENlC8U8A==
+  dependencies:
+    "@types/color-name" "*"
+
+"@types/color-name@*":
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/@types/color-name/-/color-name-1.1.2.tgz#bdeeb6fdcb78969033767951ab0cb26c7514a658"
+  integrity sha512-JWO/ZyxTKk0bLuOhAavGjnwLR73rUE7qzACnU7gMeyA/gdrSHm2xJwqNPipw2MtaZUaqQ2UG/q7pP6AQiZ8mqw==
+
+"@types/color@3.0.2":
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/@types/color/-/color-3.0.2.tgz#3779043e782f562aa9157b5fc6bd07e14fd8e7f3"
+  integrity sha512-INiJl6sfNn8iyC5paxVzqiVUEj2boIlFki02uRTAkKwAj++7aAF+ZfEv/XrIeBa0XI/fTZuDHW8rEEcEVnON+Q==
+  dependencies:
+    "@types/color-convert" "*"
+
+"@types/common-tags@1.8.4":
+  version "1.8.4"
+  resolved "https://registry.yarnpkg.com/@types/common-tags/-/common-tags-1.8.4.tgz#3b31fcb5952cd326a55cabe9dbe6c5be3c1671a0"
+  integrity sha512-S+1hLDJPjWNDhcGxsxEbepzaxWqURP/o+3cP4aa2w7yBXgdcmKGQtZzP8JbyfOd0m+33nh+8+kvxYE2UJtBDkg==
 
 "@types/component-emitter@^1.2.10":
   version "1.2.11"
@@ -8355,10 +8289,10 @@
   resolved "https://registry.yarnpkg.com/@types/cookie/-/cookie-0.4.1.tgz#bfd02c1f2224567676c1545199f87c3a861d878d"
   integrity sha512-XW/Aa8APYr6jSVVA1y/DEIZX0/GMKLEVekNG727R8cs56ahETkRAy/3DR7+fJyh7oUgGwNQaRfXCun0+KbWY7Q==
 
-"@types/cookies@0.7.8":
-  version "0.7.8"
-  resolved "https://registry.yarnpkg.com/@types/cookies/-/cookies-0.7.8.tgz#16fccd6d58513a9833c527701a90cc96d216bc18"
-  integrity sha512-y6KhF1GtsLERUpqOV+qZJrjUGzc0GE6UTa0b5Z/LZ7Nm2mKSdCXmS6Kdnl7fctPNnMSouHjxqEWI12/YqQfk5w==
+"@types/cookies@0.7.10":
+  version "0.7.10"
+  resolved "https://registry.yarnpkg.com/@types/cookies/-/cookies-0.7.10.tgz#c4881dca4dd913420c488508d192496c46eb4fd0"
+  integrity sha512-hmUCjAk2fwZVPPkkPBcI7jGLIR5mg4OVoNMBwU6aVsMm/iNPY7z9/R+x2fSwLt/ZXoGua6C5Zy2k5xOo9jUyhQ==
   dependencies:
     "@types/connect" "*"
     "@types/express" "*"
@@ -8445,10 +8379,10 @@
     "@types/qs" "*"
     "@types/range-parser" "*"
 
-"@types/express@*", "@types/express@4.17.19", "@types/express@^4.17.17", "@types/express@^4.17.2", "@types/express@^4.7.0":
-  version "4.17.19"
-  resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.19.tgz#6ff9b4851fda132c5d3dcd2f89fdb6a7a0031ced"
-  integrity sha512-UtOfBtzN9OvpZPPbnnYunfjM7XCI4jyk1NvnFhTVz5krYAnW4o5DCoIekvms+8ApqhB4+9wSge1kBijdfTSmfg==
+"@types/express@*", "@types/express@4.17.21", "@types/express@^4.17.17", "@types/express@^4.17.2", "@types/express@^4.7.0":
+  version "4.17.21"
+  resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.21.tgz#c26d4a151e60efe0084b23dc3369ebc631ed192d"
+  integrity sha512-ejlPM315qwLpaQlQDTjPdsUFSc6ZsP4AN6AlWnogPjQ7CVi7PYF3YVz+CY3jE2pwYf7E/7HlDAN0rV2GxTG0HQ==
   dependencies:
     "@types/body-parser" "*"
     "@types/express-serve-static-core" "^4.17.33"
@@ -8541,10 +8475,10 @@
   resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.12.tgz#d70faba7039d5fca54c83c7dbab41051d2b6f6cb"
   integrity sha512-Hr5Jfhc9eYOQNPYO5WLDq/n4jqijdHNlDXjuAQkkt+mWdQR+XJToOHrsD4cPaMXpn6KO7y2+wM8AZEs8VpBLVA==
 
-"@types/jsonwebtoken@9.0.3", "@types/jsonwebtoken@^9", "@types/jsonwebtoken@^9.0.2":
-  version "9.0.3"
-  resolved "https://registry.yarnpkg.com/@types/jsonwebtoken/-/jsonwebtoken-9.0.3.tgz#1f22283b8e1f933af9e195d720798b64b399d84c"
-  integrity sha512-b0jGiOgHtZ2jqdPgPnP6WLCXZk1T8p06A/vPGzUvxpFGgKMbjXJDjC5m52ErqBnIuWZFgGoIJyRdeG5AyreJjA==
+"@types/jsonwebtoken@9.0.5", "@types/jsonwebtoken@^9", "@types/jsonwebtoken@^9.0.2":
+  version "9.0.5"
+  resolved "https://registry.yarnpkg.com/@types/jsonwebtoken/-/jsonwebtoken-9.0.5.tgz#0bd9b841c9e6c5a937c17656e2368f65da025588"
+  integrity sha512-VRLSGzik+Unrup6BsouBeHsf4d1hOEgYWTm/7Nmw1sXoN1+tRly/Gy/po3yeahnP4jfnQWWAhQAqcNfH7ngOkA==
   dependencies:
     "@types/node" "*"
 
@@ -8565,10 +8499,10 @@
   resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.194.tgz#b71eb6f7a0ff11bff59fc987134a093029258a76"
   integrity sha512-r22s9tAS7imvBt2lyHC9B8AGwWnXaYb1tY09oyLkXDs4vArpYJzw09nj8MLx5VfciBPGIb+ZwG0ssYnEPJxn/g==
 
-"@types/luxon@3.3.2":
-  version "3.3.2"
-  resolved "https://registry.yarnpkg.com/@types/luxon/-/luxon-3.3.2.tgz#f6e3524c2486b949a4db445e85d93c8e9886dfe2"
-  integrity sha512-l5cpE57br4BIjK+9BSkFBOsWtwv6J9bJpC7gdXIzZyI0vuKvNTk0wZZrkQxMGsUAuGW9+WMNWF2IJMD7br2yeQ==
+"@types/luxon@3.3.4":
+  version "3.3.4"
+  resolved "https://registry.yarnpkg.com/@types/luxon/-/luxon-3.3.4.tgz#cda5c0709a0c4c01ba059c40e62d76610479049a"
+  integrity sha512-H9OXxv4EzJwE75aTPKpiGXJq+y4LFxjpsdgKwSmr503P5DkWc3AG7VAFYrFNVvqemT5DfgZJV9itYhqBHSGujA==
 
 "@types/mdx@^2.0.0":
   version "2.0.5"
@@ -8613,19 +8547,19 @@
     "@types/node" "*"
     form-data "^3.0.0"
 
-"@types/node-jose@1.1.11":
-  version "1.1.11"
-  resolved "https://registry.yarnpkg.com/@types/node-jose/-/node-jose-1.1.11.tgz#321d4a582401b9a6e2eb2022363f344db65ab453"
-  integrity sha512-8hEAhDB2A3k0Inhxh71qWfEp9mg970z/NvEPkzJN5KZSlIE47lEeYf3k+pNvk/W4hiSL/A0lW0AO7Fw8QMEtkA==
+"@types/node-jose@1.1.13":
+  version "1.1.13"
+  resolved "https://registry.yarnpkg.com/@types/node-jose/-/node-jose-1.1.13.tgz#aeb9f5894afa8ae6c13182ca99d92f4bcc22f70f"
+  integrity sha512-QjMd4yhwy1EvSToQn0YI3cD29YhyfxFwj7NecuymjLys2/P0FwxWnkgBlFxCai6Y3aBCe7rbwmqwJJawxlgcXw==
   dependencies:
     "@types/node" "*"
 
 "@types/node@*", "@types/node@>=10.0.0", "@types/node@>=12.12.47", "@types/node@>=13.7.0", "@types/node@>=8.1.0", "@types/node@^20.5.7":
-  version "20.8.5"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-20.8.5.tgz#13352ae1f80032171616910e8aba2e3e52e57d96"
-  integrity sha512-SPlobFgbidfIeOYlzXiEjSYeIJiOCthv+9tSQVpvk4PAdIIc+2SmjNVzWXk9t0Y7dl73Zdf+OgXKHX9XtkqUpw==
+  version "20.9.0"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-20.9.0.tgz#bfcdc230583aeb891cf51e73cfdaacdd8deae298"
+  integrity sha512-nekiGu2NDb1BcVofVcEKMIwzlx4NjHlcjhoxxKBNLtz15Y1z7MYf549DFvkHSId02Ax6kGwWntIBPC3l/JZcmw==
   dependencies:
-    undici-types "~5.25.1"
+    undici-types "~5.26.4"
 
 "@types/node@^10.0.3":
   version "10.17.60"
@@ -8647,10 +8581,10 @@
   resolved "https://registry.yarnpkg.com/@types/node/-/node-9.6.61.tgz#29f124eddd41c4c74281bd0b455d689109fc2a2d"
   integrity sha512-/aKAdg5c8n468cYLy2eQrcR5k6chlbNwZNGUj3TboyPa2hcO2QAJcfymlqPzMiRj8B6nYKXjzQz36minFE0RwQ==
 
-"@types/nodemailer@6.4.11":
-  version "6.4.11"
-  resolved "https://registry.yarnpkg.com/@types/nodemailer/-/nodemailer-6.4.11.tgz#98630b15b95f292940d27cf4f314c42c70dfdf19"
-  integrity sha512-Ld2c0frwpGT4VseuoeboCXQ7UJIkK3X7Lx/4YsZEiUHtHsthWAOCYtf6PAiLhMtfwV0cWJRabLBS3+LD8x6Nrw==
+"@types/nodemailer@6.4.14":
+  version "6.4.14"
+  resolved "https://registry.yarnpkg.com/@types/nodemailer/-/nodemailer-6.4.14.tgz#5c81a5e856db7f8ede80013e6dbad7c5fb2283e2"
+  integrity sha512-fUWthHO9k9DSdPCSPRqcu6TWhYyxTBg382vlNIttSe9M7XfsT06y0f24KHXtbnijPGGRIcVvdKHTNikOI6qiHA==
   dependencies:
     "@types/node" "*"
 
@@ -8704,10 +8638,10 @@
   resolved "https://registry.yarnpkg.com/@types/range-parser/-/range-parser-1.2.4.tgz#cd667bcfdd025213aafb7ca5915a932590acdcdc"
   integrity sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw==
 
-"@types/react-dom@18.2.13":
-  version "18.2.13"
-  resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-18.2.13.tgz#89cd7f9ec8b28c8b6f0392b9591671fb4a9e96b7"
-  integrity sha512-eJIUv7rPP+EC45uNYp/ThhSpE16k22VJUknt5OLoH9tbXoi8bMhwLf5xRuWMywamNbWzhrSmU7IBJfPup1+3fw==
+"@types/react-dom@18.2.15":
+  version "18.2.15"
+  resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-18.2.15.tgz#921af67f9ee023ac37ea84b1bc0cc40b898ea522"
+  integrity sha512-HWMdW+7r7MR5+PZqJF6YFNSCtjz1T0dsvo/f1BV6HkV+6erD/nA7wd9NM00KVG83zf2nJ7uATPO9ttdIPvi3gg==
   dependencies:
     "@types/react" "*"
 
@@ -8725,10 +8659,10 @@
   dependencies:
     "@types/react" "*"
 
-"@types/react@*", "@types/react@18.2.28", "@types/react@>=16":
-  version "18.2.28"
-  resolved "https://registry.yarnpkg.com/@types/react/-/react-18.2.28.tgz#86877465c0fcf751659a36c769ecedfcfacee332"
-  integrity sha512-ad4aa/RaaJS3hyGz0BGegdnSRXQBkd1CCYDCdNjBPg90UUpLgo+WlJqb9fMYUxtehmzF3PJaTWqRZjko6BRzBg==
+"@types/react@*", "@types/react@18.2.37", "@types/react@>=16":
+  version "18.2.37"
+  resolved "https://registry.yarnpkg.com/@types/react/-/react-18.2.37.tgz#0f03af69e463c0f19a356c2660dbca5d19c44cae"
+  integrity sha512-RGAYMi2bhRgEXT3f4B92WTohopH6bIXw05FuGlmJEnv/omEn190+QYEIYxIAuIBdKgboYYdVved2p1AxZVQnaw==
   dependencies:
     "@types/prop-types" "*"
     "@types/scheduler" "*"
@@ -8829,10 +8763,10 @@
   resolved "https://registry.yarnpkg.com/@types/unist/-/unist-2.0.6.tgz#250a7b16c3b91f672a24552ec64678eeb1d3a08d"
   integrity sha512-PBjIUxZHOuj0R15/xuwJYjFi+KZdNFrehocChv4g5hu6aFroHue8m0lBP0POdK2nKzbw0cgV1mws8+V/JAcEkQ==
 
-"@types/validator@13.11.3":
-  version "13.11.3"
-  resolved "https://registry.yarnpkg.com/@types/validator/-/validator-13.11.3.tgz#6afba392782b44dd6cfeb390cc06c45833066ad9"
-  integrity sha512-jxjhh33aTYDHnrV1vZ3AvWQHfrGx2f5UxKjaP13l5q04fG+/hCKKm0MfodIoCqxevhbcfBb6ZjynyHuQ/jueGQ==
+"@types/validator@13.11.6":
+  version "13.11.6"
+  resolved "https://registry.yarnpkg.com/@types/validator/-/validator-13.11.6.tgz#8645efedfd891bc1d7ad82539005d7ff785fe294"
+  integrity sha512-HUgHujPhKuNzgNXBRZKYexwoG+gHKU+tnfPqjWXFghZAnn73JElicMkuSKJyLGr9JgyA8IgK7fj88IyA9rwYeQ==
 
 "@types/yargs-parser@*":
   version "21.0.0"
@@ -8975,15 +8909,15 @@
     "@uiw/codemirror-extensions-basic-setup" "4.21.20"
     codemirror "^6.0.0"
 
-"@vitejs/plugin-react@4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@vitejs/plugin-react/-/plugin-react-4.1.0.tgz#e4f56f46fd737c5d386bb1f1ade86ba275fe09bd"
-  integrity sha512-rM0SqazU9iqPUraQ2JlIvReeaxOoRj6n+PzB1C0cBzIbd8qP336nC39/R9yPi3wVcah7E7j/kdU1uCUqMEU4OQ==
+"@vitejs/plugin-react@4.1.1":
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/@vitejs/plugin-react/-/plugin-react-4.1.1.tgz#a10254dc76778027407d01b6ddbca53b23852a72"
+  integrity sha512-Jie2HERK+uh27e+ORXXwEP5h0Y2lS9T2PRGbfebiHGlwzDO0dEnd2aNtOR/qjBlPb1YgxwAONeblL1xqLikLag==
   dependencies:
-    "@babel/core" "^7.22.20"
+    "@babel/core" "^7.23.2"
     "@babel/plugin-transform-react-jsx-self" "^7.22.5"
     "@babel/plugin-transform-react-jsx-source" "^7.22.5"
-    "@types/babel__core" "^7.20.2"
+    "@types/babel__core" "^7.20.3"
     react-refresh "^0.14.0"
 
 "@vitejs/plugin-react@^3.0.1":
@@ -10225,14 +10159,16 @@ axios-retry@3.2.0:
   dependencies:
     is-retry-allowed "^1.1.0"
 
-axios@0.21.4:
-  version "0.21.4"
-  resolved "https://registry.yarnpkg.com/axios/-/axios-0.21.4.tgz#c67b90dc0568e5c1cf2b0b858c43ba28e2eda575"
-  integrity sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==
+axios@1.6.0, axios@^1.0.0, axios@^1.3.3:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/axios/-/axios-1.6.0.tgz#f1e5292f26b2fd5c2e66876adc5b06cdbd7d2102"
+  integrity sha512-EZ1DYihju9pwVB+jg67ogm+Tmqc6JmhamRN6I4Zt8DfZu5lbcQGw3ozH9lFejSJgs/ibaef3A9PMXPLeefFGJg==
   dependencies:
-    follow-redirects "^1.14.0"
+    follow-redirects "^1.15.0"
+    form-data "^4.0.0"
+    proxy-from-env "^1.1.0"
 
-axios@^0.27.0, axios@^0.27.2:
+axios@^0.27.2:
   version "0.27.2"
   resolved "https://registry.yarnpkg.com/axios/-/axios-0.27.2.tgz#207658cc8621606e586c85db4b41a750e756d972"
   integrity sha512-t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ==
@@ -10240,14 +10176,10 @@ axios@^0.27.0, axios@^0.27.2:
     follow-redirects "^1.14.9"
     form-data "^4.0.0"
 
-axios@^1.0.0, axios@^1.3.3:
-  version "1.3.4"
-  resolved "https://registry.yarnpkg.com/axios/-/axios-1.3.4.tgz#f5760cefd9cfb51fd2481acf88c05f67c4523024"
-  integrity sha512-toYm+Bsyl6VC5wSkfkbbNB6ROv7KY93PEBBL6xyDczaIHasAiv4wPqQ/c4RjoQzipxRD2W5g21cOqQulZ7rHwQ==
-  dependencies:
-    follow-redirects "^1.15.0"
-    form-data "^4.0.0"
-    proxy-from-env "^1.1.0"
+b4a@^1.6.4:
+  version "1.6.4"
+  resolved "https://registry.yarnpkg.com/b4a/-/b4a-1.6.4.tgz#ef1c1422cae5ce6535ec191baeed7567443f36c9"
+  integrity sha512-fpWrvyVHEKyeEvbKZTVOeZF3VSKKWtJxFIxX/jaVPf+cLbGUSitjb49pHLqPV2BUNNZ0LcoeEGfE/YCpyDYHIw==
 
 babel-code-frame@^6.26.0:
   version "6.26.0"
@@ -11998,21 +11930,21 @@ broccoli-templater@^2.0.1:
     rimraf "^2.6.2"
     walk-sync "^0.3.3"
 
-broccoli-terser-sourcemap@4.1.0, broccoli-terser-sourcemap@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/broccoli-terser-sourcemap/-/broccoli-terser-sourcemap-4.1.0.tgz#5f37441b64a3b6bfb0c67e9af232259c9576f115"
-  integrity sha512-zkNnjsAbP+M5rG2aMM1EE4BmXPUSxFKmtLUkUs2D1DLTOJQoF1xlOjGWjjKYCFy5tw8t4+tgGJ+HVa2ucJZ8sw==
+broccoli-terser-sourcemap@4.1.1, broccoli-terser-sourcemap@^4.1.0:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/broccoli-terser-sourcemap/-/broccoli-terser-sourcemap-4.1.1.tgz#4c26696e07a822e1fc91fb48c5b6d6c70d5ca9b2"
+  integrity sha512-8sbpRf0/+XeszBJQM7vph2UNj4Kal0lCI/yubcrBIzb2NvYj5gjTHJABXOdxx5mKNmlCMu2hx2kvOtMpQsxrfg==
   dependencies:
     async-promise-queue "^1.0.5"
-    broccoli-plugin "^4.0.3"
-    debug "^4.1.0"
+    broccoli-plugin "^4.0.7"
+    convert-source-map "^2.0.0"
+    debug "^4.3.1"
     lodash.defaultsdeep "^4.6.1"
     matcher-collection "^2.0.1"
-    source-map-url "^0.4.0"
     symlink-or-copy "^1.3.1"
-    terser "^5.3.0"
+    terser "^5.7.0"
     walk-sync "^2.2.0"
-    workerpool "^6.0.0"
+    workerpool "^6.1.5"
 
 broccoli@^3.5.0:
   version "3.5.2"
@@ -13535,7 +13467,7 @@ cookie@0.4.2, cookie@~0.4.1:
   resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.2.tgz#0e41f24de5ecf317947c82fc789e06a884824432"
   integrity sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA==
 
-cookie@0.5.0, cookie@^0.5.0:
+cookie@0.5.0:
   version "0.5.0"
   resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.5.0.tgz#d1f5d71adec6558c58f389987c366aa47e994f8b"
   integrity sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==
@@ -14487,10 +14419,10 @@ detect-indent@^4.0.0:
   dependencies:
     repeating "^2.0.0"
 
-detect-libc@^2.0.0, detect-libc@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-2.0.1.tgz#e1897aa88fa6ad197862937fbc0441ef352ee0cd"
-  integrity sha512-463v3ZeIrcWtdgIg6vI6XUncguvr2TnGl4SzDXinkt9mSLpBJKXT3mW6xT3VQdDN11+WVs29pgvivTc4Lp8v+w==
+detect-libc@^2.0.0, detect-libc@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-2.0.2.tgz#8ccf2ba9315350e1241b88d0ac3b0e1fbd99605d"
+  integrity sha512-UX6sGumvvqSaXgdKGUsgZWqcUyIXZ/vZTrlRT/iobiKhGL0zL4d3osHj3uqllWJK+i+sixDS/3COVEOFbupFyw==
 
 detect-newline@3.1.0:
   version "3.1.0"
@@ -15213,15 +15145,15 @@ ember-cli-dependency-checker@3.3.2:
     resolve "^1.22.0"
     semver "^5.7.1"
 
-ember-cli-deprecation-workflow@2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/ember-cli-deprecation-workflow/-/ember-cli-deprecation-workflow-2.1.0.tgz#f0d38ece7ac0ab7b3f83790a3a092e3472f58cff"
-  integrity sha512-Ay9P9iKMJdY4Gq5XPowh3HqqeAzLfwBRj1oB1ZKkDW1fryZQWBN4pZuRnjnB+3VWZjBnZif5e7Pacc7YNW9hWg==
+ember-cli-deprecation-workflow@2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/ember-cli-deprecation-workflow/-/ember-cli-deprecation-workflow-2.2.0.tgz#277d56bdafc15dbdb7a58dee598402cdf50e0d08"
+  integrity sha512-23bXZqZJBJSKBTfT0LK7qzSJX861TgafL6RVdMfn/iubpLnoZIWergYwEdgs24CNTUbuehVbHy2Q71o8jYfwfw==
   dependencies:
+    "@ember/string" "^3.0.0"
     broccoli-funnel "^3.0.3"
     broccoli-merge-trees "^4.2.0"
     broccoli-plugin "^4.0.5"
-    ember-cli-htmlbars "^5.3.2"
 
 ember-cli-element-closest-polyfill@^0.0.2:
   version "0.0.2"
@@ -15300,7 +15232,7 @@ ember-cli-htmlbars@^4.2.0, ember-cli-htmlbars@^4.2.3, ember-cli-htmlbars@^4.3.1:
     strip-bom "^4.0.0"
     walk-sync "^2.0.2"
 
-ember-cli-htmlbars@^5.0.0, ember-cli-htmlbars@^5.1.0, ember-cli-htmlbars@^5.1.2, ember-cli-htmlbars@^5.2.0, ember-cli-htmlbars@^5.3.1, ember-cli-htmlbars@^5.3.2, ember-cli-htmlbars@^5.7.1:
+ember-cli-htmlbars@^5.0.0, ember-cli-htmlbars@^5.1.0, ember-cli-htmlbars@^5.1.2, ember-cli-htmlbars@^5.2.0, ember-cli-htmlbars@^5.3.1, ember-cli-htmlbars@^5.7.1:
   version "5.7.2"
   resolved "https://registry.yarnpkg.com/ember-cli-htmlbars/-/ember-cli-htmlbars-5.7.2.tgz#e0cd2fb3c20d85fe4c3e228e6f0590ee1c645ba8"
   integrity sha512-Uj6R+3TtBV5RZoJY14oZn/sNPnc+UgmC8nb5rI4P3fR/gYoyTFIZSXiIM7zl++IpMoIrocxOrgt+mhonKphgGg==
@@ -15429,10 +15361,10 @@ ember-cli-string-utils@^1.0.0, ember-cli-string-utils@^1.1.0:
   resolved "https://registry.yarnpkg.com/ember-cli-string-utils/-/ember-cli-string-utils-1.1.0.tgz#39b677fc2805f55173735376fcef278eaa4452a1"
   integrity sha512-PlJt4fUDyBrC/0X+4cOpaGCiMawaaB//qD85AXmDRikxhxVzfVdpuoec02HSiTGTTB85qCIzWBIh8lDOiMyyFg==
 
-ember-cli-terser@4.0.2:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/ember-cli-terser/-/ember-cli-terser-4.0.2.tgz#c436a9e4159f76a615b051cba0584844652b7dcd"
-  integrity sha512-Ej77K+YhCZImotoi/CU2cfsoZaswoPlGaM5TB3LvjvPDlVPRhxUHO2RsaUVC5lsGeRLRiHCOxVtoJ6GyqexzFA==
+ember-cli-terser@4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/ember-cli-terser/-/ember-cli-terser-4.0.1.tgz#0da0b8f2b09989e8c992b207553ddec1bbb65915"
+  integrity sha512-vvp0uVl8reYeW9EZjSXRPR3Bq7y4u9CYlUdI7j/WzMPDj3/gUHU4Z7CHYOCrftrClQvFfqO2eXmHwDA6F7SLug==
   dependencies:
     broccoli-terser-sourcemap "^4.1.0"
 
@@ -15676,9 +15608,9 @@ ember-cli@3.24.0:
     yam "^1.0.0"
 
 ember-compatibility-helpers@^1.1.1, ember-compatibility-helpers@^1.1.2, ember-compatibility-helpers@^1.2.0, ember-compatibility-helpers@^1.2.1, ember-compatibility-helpers@^1.2.4, ember-compatibility-helpers@^1.2.5:
-  version "1.2.6"
-  resolved "https://registry.yarnpkg.com/ember-compatibility-helpers/-/ember-compatibility-helpers-1.2.6.tgz#603579ab2fb14be567ef944da3fc2d355f779cd8"
-  integrity sha512-2UBUa5SAuPg8/kRVaiOfTwlXdeVweal1zdNPibwItrhR0IvPrXpaqwJDlEZnWKEoB+h33V0JIfiWleSG6hGkkA==
+  version "1.2.7"
+  resolved "https://registry.yarnpkg.com/ember-compatibility-helpers/-/ember-compatibility-helpers-1.2.7.tgz#b4f138bba844f8f38f0b8f4d7e928841cd5e6591"
+  integrity sha512-BtkjulweiXo9c3yVWrtexw2dTmBrvavD/xixNC6TKOBdrixUwU+6nuOO9dufDWsMxoid7MvtmDpzc9+mE8PdaA==
   dependencies:
     babel-plugin-debug-macros "^0.2.0"
     ember-cli-version-checker "^5.1.1"
@@ -17572,10 +17504,10 @@ fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3:
   resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525"
   integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==
 
-fast-fifo@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/fast-fifo/-/fast-fifo-1.1.0.tgz#17d1a3646880b9891dfa0c54e69c5fef33cad779"
-  integrity sha512-Kl29QoNbNvn4nhDsLYjyIAaIqaJB6rBx5p3sL9VjaefJ+eMFBWVZiaoguaoZfzEKr5RhAti0UgM8703akGPJ6g==
+fast-fifo@^1.1.0, fast-fifo@^1.2.0:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/fast-fifo/-/fast-fifo-1.3.2.tgz#286e31de96eb96d38a97899815740ba2a4f3640c"
+  integrity sha512-/d9sfos4yxzpwkDkuN7k2SqFKtYNmCTzgfEpz82x34IM9/zc8KGxQoXg1liNC/izpRM/MBdt44Nmx41ZWqk+FQ==
 
 fast-glob@3.2.7:
   version "3.2.7"
@@ -18069,7 +18001,7 @@ focus-trap@^6.7.2:
   dependencies:
     tabbable "^5.3.3"
 
-follow-redirects@^1.0.0, follow-redirects@^1.14.0, follow-redirects@^1.14.9, follow-redirects@^1.15.0:
+follow-redirects@^1.0.0, follow-redirects@^1.14.9, follow-redirects@^1.15.0:
   version "1.15.2"
   resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.2.tgz#b460864144ba63f2681096f274c4e57026da2c13"
   integrity sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==
@@ -19003,10 +18935,10 @@ growly@^1.3.0:
   resolved "https://registry.yarnpkg.com/growly/-/growly-1.3.0.tgz#f10748cbe76af964b7c96c93c6bcc28af120c081"
   integrity sha512-+xGQY0YyAWCnqy7Cd++hc2JqMYzlm0dG30Jd0beaA64sROr8C4nt8Yc9V5Ro3avlSUDTN0ulqP/VBKi1/lLygw==
 
-gscan@4.39.4:
-  version "4.39.4"
-  resolved "https://registry.yarnpkg.com/gscan/-/gscan-4.39.4.tgz#af73181874b761414c04a1498a2b62b2119dfb9b"
-  integrity sha512-jb6vnclLhHa10Z+RCcmfovy78eeE3EknASEsH5YS1OPGn66CG1Tja8IJffLUJk4mFnqZECjn7YrWKJNkgYpK4A==
+gscan@4.40.0:
+  version "4.40.0"
+  resolved "https://registry.yarnpkg.com/gscan/-/gscan-4.40.0.tgz#68c440c77dc74d99d36442f283b431b08249b53b"
+  integrity sha512-+rrVRI3t9ZE1wRYn+cYZ3RpItS8eTQ9Vq09+T4IHpCmrUZ0WWCGYzzHdXoIJtC5YnwUoQDO3hpd20+O4+GT46w==
   dependencies:
     "@sentry/node" "^7.73.0"
     "@tryghost/config" "^0.2.18"
@@ -19392,10 +19324,10 @@ html-to-text@8.2.1:
     minimist "^1.2.6"
     selderee "^0.6.0"
 
-html-validate@8.7.0:
-  version "8.7.0"
-  resolved "https://registry.yarnpkg.com/html-validate/-/html-validate-8.7.0.tgz#cfd47e0568b6c5c14047022a78257dbe63b1d229"
-  integrity sha512-fsDHUxzVNzXzV2KpPOx5GbGRCK0cFs7a8+9jE5QTyYUGAlm1PNGst8Vi0U7hSmootkCBxY3bu7LgQBjjZDeBPw==
+html-validate@8.7.1:
+  version "8.7.1"
+  resolved "https://registry.yarnpkg.com/html-validate/-/html-validate-8.7.1.tgz#3d24d65c96a773ed5c106126953768c73a896d31"
+  integrity sha512-8zfWtAfyIWxqoHG1M8+8zCdKLCBFn/48Zdf2mRL6OuDvRTCSkSIDOYChLr22KiN3UJii8cTbMtH5PrQFw0ZWWg==
   dependencies:
     "@babel/code-frame" "^7.10.0"
     "@html-validate/stylish" "^4.1.0"
@@ -19680,12 +19612,12 @@ i18next-parser@8.8.0:
     vinyl-fs "^3.0.2"
     vue-template-compiler "^2.6.11"
 
-i18next@23.6.0:
-  version "23.6.0"
-  resolved "https://registry.yarnpkg.com/i18next/-/i18next-23.6.0.tgz#c6e996cfd3fef0bf60be3b7c581c35338dba5a71"
-  integrity sha512-z0Cxr0MGkt+kli306WS4nNNM++9cgt2b2VCMprY92j+AIab/oclgPxdwtTZVLP1zn5t5uo8M6uLsZmYrcjr3HA==
+i18next@23.7.3:
+  version "23.7.3"
+  resolved "https://registry.yarnpkg.com/i18next/-/i18next-23.7.3.tgz#9e38498ddd1de54890c73bf57dd00d4f204af1d7"
+  integrity sha512-XetHM9UCk5oeeIcE2hu6Os16mq/zPHi8v/janExQjbFtx4ndNg9ye5OyAz+f5aYums8A1WcnXa7QikaEjyELPg==
   dependencies:
-    "@babel/runtime" "^7.22.5"
+    "@babel/runtime" "^7.23.2"
 
 i18next@^22.0.4:
   version "22.5.1"
@@ -22594,20 +22526,15 @@ lru-memoizer@^2.2.0:
     lodash.clonedeep "^4.5.0"
     lru-cache "~4.0.0"
 
-lru_map@^0.3.3:
-  version "0.3.3"
-  resolved "https://registry.yarnpkg.com/lru_map/-/lru_map-0.3.3.tgz#b5c8351b9464cbd750335a79650a0ec0e56118dd"
-  integrity sha512-Pn9cox5CsMYngeDbmChANltQl+5pi6XmTrraMSzhPmMBbmgcxmqWry0U3PGapCU1yB4/LqCcom7qhHZiF/jGfQ==
-
 ltgt@^2.1.2:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/ltgt/-/ltgt-2.2.1.tgz#f35ca91c493f7b73da0e07495304f17b31f87ee5"
   integrity sha512-AI2r85+4MquTw9ZYqabu4nMwy9Oftlfa/e/52t9IjtfG+mGBbTNdAoZ3RQKLHR6r0wQnwZnPIEh/Ya6XTWAKNA==
 
-luxon@3.4.3, luxon@^3.0.0, luxon@^3.3.0:
-  version "3.4.3"
-  resolved "https://registry.yarnpkg.com/luxon/-/luxon-3.4.3.tgz#8ddf0358a9492267ffec6a13675fbaab5551315d"
-  integrity sha512-tFWBiv3h7z+T/tDaoxA8rqTxy1CHV6gHS//QdaH4pulbq/JuBSGgQspQQqcgnwdAx6pNI7cmvz5Sv/addzHmUg==
+luxon@3.4.4, luxon@^3.0.0, luxon@^3.3.0:
+  version "3.4.4"
+  resolved "https://registry.yarnpkg.com/luxon/-/luxon-3.4.4.tgz#cf20dc27dc532ba41a169c43fdcc0063601577af"
+  integrity sha512-zobTr7akeGHnv7eBOXcRgMeCP6+uyYsczwmeRCauvpvaAltgNyTbLH/+VaEAPUeWBT+1GuNmz4wC/6jtQzbbVA==
 
 luxon@^1.26.0:
   version "1.28.0"
@@ -23062,72 +22989,72 @@ merge@^1.2.0:
   resolved "https://registry.yarnpkg.com/merge/-/merge-1.2.1.tgz#38bebf80c3220a8a487b6fcfb3941bb11720c145"
   integrity sha512-VjFo4P5Whtj4vsLzsYBu5ayHhoHJ0UqNm7ibvShmbmoz7tGi0vXaoJbGdB+GmDMLUdg8DpQXEIeVDAe8MaABvQ==
 
-metascraper-author@5.37.1:
-  version "5.37.1"
-  resolved "https://registry.yarnpkg.com/metascraper-author/-/metascraper-author-5.37.1.tgz#a91549125d0b6b3585bee341d74ca62226113f7b"
-  integrity sha512-OR0oWsDZR2vNtzswO6r4in4AtFvLMDv3WcoRCy+gEmvQWN7vwwehMZ0JP5cuiLVrQGaZuUQF597RKTMpAs2aFw==
+metascraper-author@5.38.0:
+  version "5.38.0"
+  resolved "https://registry.yarnpkg.com/metascraper-author/-/metascraper-author-5.38.0.tgz#957b1e904e015f1d8f013b45a852e6335ad853bd"
+  integrity sha512-ExDpAsmSNUZwQgOQ9GXZSxl5jFsCtiMrOamyYVAKUOjTiSdDIqvEofnq8iydAK2ksqXbJMFAWIqOYsbEJIr/rA==
   dependencies:
-    "@metascraper/helpers" "^5.37.1"
+    "@metascraper/helpers" "^5.38.0"
 
-metascraper-description@5.37.1:
-  version "5.37.1"
-  resolved "https://registry.yarnpkg.com/metascraper-description/-/metascraper-description-5.37.1.tgz#91c5bc5dbb609e5ff9499a185035d5daf62b066d"
-  integrity sha512-kaDOl9EW10ArDOvMHtue4mvpU+/GHqA2Hv9nPVVPxEa+yItubzMfoIyV34Bg4XOx/yITeV2sLGqZCE9XenBN4A==
+metascraper-description@5.38.0:
+  version "5.38.0"
+  resolved "https://registry.yarnpkg.com/metascraper-description/-/metascraper-description-5.38.0.tgz#8df1ab0a6edd03b495344b0cd1f7508818f22344"
+  integrity sha512-z3VUEWLVxscVyx4NH0CIQ1DMuo3oUKMqC8FkYyHZ98wq7bq0MmD4cEE2CTnOYgFQZwXAWkxl+VMpAZ/1zUsslQ==
   dependencies:
-    "@metascraper/helpers" "^5.37.1"
+    "@metascraper/helpers" "^5.38.0"
 
-metascraper-image@5.37.1:
-  version "5.37.1"
-  resolved "https://registry.yarnpkg.com/metascraper-image/-/metascraper-image-5.37.1.tgz#674b0bcd8c8c15c365a91ac0f1f23dcd218ccbeb"
-  integrity sha512-1G2/mTWfydQ04o4pVRoq+751NSIE97YHc4WF8rGBQ7RVyLznNWXykqNS9FU13BJq+RavWBPDZU8sITFSLS79+g==
+metascraper-image@5.38.0:
+  version "5.38.0"
+  resolved "https://registry.yarnpkg.com/metascraper-image/-/metascraper-image-5.38.0.tgz#7e387a8d4d1bfe782f600dc8f2706724d1bc8736"
+  integrity sha512-xH8wSObBuS11cJce64yFlsViVfYoIyexfoNzhOrGBuf/UztQkYizFcC9WlJL4zd21qkYBHSymizFaNuS9lDmPg==
   dependencies:
-    "@metascraper/helpers" "^5.37.1"
+    "@metascraper/helpers" "^5.38.0"
 
-metascraper-logo-favicon@5.37.1:
-  version "5.37.1"
-  resolved "https://registry.yarnpkg.com/metascraper-logo-favicon/-/metascraper-logo-favicon-5.37.1.tgz#53e58d3930a4ca4d5b3ffd0b0f124108999bc988"
-  integrity sha512-5nrjuaRQwMPmiqHWkpaeIgy+e6TF4V0MKvtPhFS9/2o6LIOga4xMtK3NYUFw042CufraUmfeI1kUlJ3yFYqGnw==
+metascraper-logo-favicon@5.38.0:
+  version "5.38.0"
+  resolved "https://registry.yarnpkg.com/metascraper-logo-favicon/-/metascraper-logo-favicon-5.38.0.tgz#4424b58b48222185e11fd2b66af89ca79f1af80f"
+  integrity sha512-9vrK7n8DUG9jkXygJuYF5jGKnOHpoR++hVGscIuYBYBu7MFtWyHnPNJcd1TEWWPIjsxOeBlSxrZGmrqqVl1nKg==
   dependencies:
     "@keyvhq/memoize" "~2.0.3"
-    "@metascraper/helpers" "^5.37.1"
+    "@metascraper/helpers" "^5.38.0"
     lodash "~4.17.21"
     reachable-url "~1.7.1"
 
-metascraper-logo@5.37.1:
-  version "5.37.1"
-  resolved "https://registry.yarnpkg.com/metascraper-logo/-/metascraper-logo-5.37.1.tgz#49dfa6c515737cbbe5ed1ad4bd28a6f04521c9c1"
-  integrity sha512-1pQ/RvrF4Yh7zH/3HlYeyPOINvNVr7UhdOy/PPDrMjvPSE7MubX6enpg99S4hMdRHQXmuDniTEgWg388lWZSug==
+metascraper-logo@5.38.0:
+  version "5.38.0"
+  resolved "https://registry.yarnpkg.com/metascraper-logo/-/metascraper-logo-5.38.0.tgz#f57e1d1a5354bbfcb356513dac0c8347654bfc95"
+  integrity sha512-OkWahCkWe5IU+3J3DIWYtPrWjX2hdhFm/cC4ee8/W7BwN9RXVgk6q8BMnoG7iP3lBlXMXkUAuE9cMRNlWdAzRg==
   dependencies:
-    "@metascraper/helpers" "^5.37.1"
+    "@metascraper/helpers" "^5.38.0"
     lodash "~4.17.21"
 
-metascraper-publisher@5.37.1:
-  version "5.37.1"
-  resolved "https://registry.yarnpkg.com/metascraper-publisher/-/metascraper-publisher-5.37.1.tgz#af3775e48763836c6b9e5d8095beacdeaeac423d"
-  integrity sha512-vUgVCCygC/ue+1RJoMI8NbzpHQ05DJ1Bsl1J8QCKsTs2XEG11sYPYXKmpljq34vZn/MNOO36TvklfsjAngf5jw==
+metascraper-publisher@5.38.0:
+  version "5.38.0"
+  resolved "https://registry.yarnpkg.com/metascraper-publisher/-/metascraper-publisher-5.38.0.tgz#3f379de2de1d1d23ddeef1fc5259567b0a9d1afe"
+  integrity sha512-uQ9Ah5CuuB4mv1c7ZHAdsCR8S09//GWxdjbBYex02zUFwTY0Dyf9KAh0DIhn8WAQfU3ZqO3W6pBKJLzf3rEJ1A==
   dependencies:
-    "@metascraper/helpers" "^5.37.1"
+    "@metascraper/helpers" "^5.38.0"
 
-metascraper-title@5.37.1:
-  version "5.37.1"
-  resolved "https://registry.yarnpkg.com/metascraper-title/-/metascraper-title-5.37.1.tgz#a6a5237a8ae617b78f7892e0b66be3c04a06608d"
-  integrity sha512-Ae9l9Sp6Ff1HUzta7CbxGY41qSuxk5oYimp5JMXMN7xmEg3R1Wk+2OgO9kMhzHhhIHSJRSv8WITPvkSvLWysuA==
+metascraper-title@5.38.0:
+  version "5.38.0"
+  resolved "https://registry.yarnpkg.com/metascraper-title/-/metascraper-title-5.38.0.tgz#317ce793bd5e9ee4651961626fa805d643701be2"
+  integrity sha512-2pQQOQzOLQYvQIXg9EZATA0RzTr3qiP3FbGL2/NV4pfkZaJ1H7Yok6ZzXjzhMHUpmChj8M2qgi7BS+zeQRlrgg==
   dependencies:
-    "@metascraper/helpers" "^5.37.1"
+    "@metascraper/helpers" "^5.38.0"
 
-metascraper-url@5.37.1:
-  version "5.37.1"
-  resolved "https://registry.yarnpkg.com/metascraper-url/-/metascraper-url-5.37.1.tgz#19973162996e208b49a7e683b0eccbadea95efa6"
-  integrity sha512-dSK+hjjT6bkH9R6O+6Iasb9z0uLSh3zNn2W6b/woHIkeJFk/5IIrpGkay+PCABDGa7WO2SLwzP0uaWPiPwYxBA==
+metascraper-url@5.38.0:
+  version "5.38.0"
+  resolved "https://registry.yarnpkg.com/metascraper-url/-/metascraper-url-5.38.0.tgz#e573f668843ba874610d8bb9aa7ce9e924a2a667"
+  integrity sha512-P2EcaPOhL30uQh/rlx+htuWN4VPTepRfZq+GWkRT72wsjIAoyEkMsmGnR6qdrldEAwuohX5gdVuNcsdZZsdEIg==
   dependencies:
-    "@metascraper/helpers" "^5.37.1"
+    "@metascraper/helpers" "^5.38.0"
 
-metascraper@5.37.1:
-  version "5.37.1"
-  resolved "https://registry.yarnpkg.com/metascraper/-/metascraper-5.37.1.tgz#f2f94491cf5385d3a00c142cd7643f99b9db4fad"
-  integrity sha512-uBj6wUyrD90qLRpewYLHRK4FDhihruz/XIs7BCnsmzSlAKpZnb4LWzqy7iu0nCuDGfBwZCOnUiDAIUv5SFRNZw==
+metascraper@5.38.0:
+  version "5.38.0"
+  resolved "https://registry.yarnpkg.com/metascraper/-/metascraper-5.38.0.tgz#bf82d20ae8efbee059c6d3b1b4015c8c13078b2b"
+  integrity sha512-MM0bpHFBbmyLl52Pe82SBh/MVHXnMzglXbYfFvw/fshw1SRddeIEC+fZoFWnp3plr2F+wMUvOLco2cmeNNycvg==
   dependencies:
-    "@metascraper/helpers" "^5.37.1"
+    "@metascraper/helpers" "^5.38.0"
     cheerio "~1.0.0-rc.12"
     lodash "~4.17.21"
     whoops "~4.1.4"
@@ -23648,9 +23575,9 @@ moment@2.24.0, moment@2.27.0, moment@2.29.1, moment@2.29.3, moment@2.29.4, "mome
   resolved "https://registry.yarnpkg.com/moment/-/moment-2.24.0.tgz#0d055d53f5052aa653c9f6eb68bb5d12bf5c2b5b"
   integrity sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg==
 
-monobundle@TryGhost/monobundle#44fdf2c8e304e797a04858bfd7339b2a1fa47441:
+monobundle@TryGhost/monobundle#811679e94b75f82a0fb1d00a11e6e0b9f6e5e44a:
   version "0.1.0"
-  resolved "https://codeload.github.com/TryGhost/monobundle/tar.gz/44fdf2c8e304e797a04858bfd7339b2a1fa47441"
+  resolved "https://codeload.github.com/TryGhost/monobundle/tar.gz/811679e94b75f82a0fb1d00a11e6e0b9f6e5e44a"
   dependencies:
     detect-indent "6.1.0"
     detect-newline "3.1.0"
@@ -23779,10 +23706,10 @@ mysql2@3.2.0:
     seq-queue "^0.0.5"
     sqlstring "^2.3.2"
 
-mysql2@3.6.2:
-  version "3.6.2"
-  resolved "https://registry.yarnpkg.com/mysql2/-/mysql2-3.6.2.tgz#be2eeba80c5167ffb856c48d61be5ac0e5ef6c09"
-  integrity sha512-m5erE6bMoWfPXW1D5UrVwlT8PowAoSX69KcZzPuARQ3wY1RJ52NW9PdvdPo076XiSIkQ5IBTis7hxdlrQTlyug==
+mysql2@3.6.3:
+  version "3.6.3"
+  resolved "https://registry.yarnpkg.com/mysql2/-/mysql2-3.6.3.tgz#d478be7aa97ea675d92f079d072f5a45cb772902"
+  integrity sha512-qYd/1CDuW1KYZjD4tzg2O8YS3X/UWuGH8ZMHyMeggMTXL3yOdMisbwZ5SNkHzDGlZXKYLAvV8tMrEH+NUMz3fw==
   dependencies:
     denque "^2.1.0"
     generate-function "^2.3.1"
@@ -23919,16 +23846,16 @@ neo-async@^2.5.0, neo-async@^2.6.1, neo-async@^2.6.2:
   resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f"
   integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==
 
-newrelic@11.4.0:
-  version "11.4.0"
-  resolved "https://registry.yarnpkg.com/newrelic/-/newrelic-11.4.0.tgz#ba51494ce996734396f6677a1487144331d35bc2"
-  integrity sha512-mBN7QZdj1quxu7qORIMx3pK5I4XWB8dMTVrLtBjlDvR10JO1ynaHEWx2Q0TkevVQp7YjGCtBTjTnZle3FpAPGA==
+newrelic@11.5.0:
+  version "11.5.0"
+  resolved "https://registry.yarnpkg.com/newrelic/-/newrelic-11.5.0.tgz#70483a24c849fe136a933885f27bc04c52b5d423"
+  integrity sha512-y1jZSAhcCKvzPXXTk29kEMKNl42RvN/nRe5WU7Fzi4nmxUxdn+m5GfSVu89hEsmJYJ8i2Rc6s4RGFX0kn9Hung==
   dependencies:
     "@grpc/grpc-js" "^1.9.4"
     "@grpc/proto-loader" "^0.7.5"
     "@newrelic/aws-sdk" "^7.0.2"
     "@newrelic/koa" "^8.0.1"
-    "@newrelic/security-agent" "0.3.0"
+    "@newrelic/security-agent" "0.4.0"
     "@newrelic/superagent" "^7.0.1"
     "@tyriar/fibonacci-heap" "^2.0.7"
     concat-stream "^2.0.0"
@@ -23967,10 +23894,10 @@ nise@^4.0.4:
     just-extend "^4.0.2"
     path-to-regexp "^1.7.0"
 
-nise@^5.1.4:
-  version "5.1.4"
-  resolved "https://registry.yarnpkg.com/nise/-/nise-5.1.4.tgz#491ce7e7307d4ec546f5a659b2efe94a18b4bbc0"
-  integrity sha512-8+Ib8rRJ4L0o3kfmyVCL7gzrohyDe0cMFTBa2d364yIrEGMEoetznKJx899YxjybU6bL9SQkYPSBBs1gyYs8Xg==
+nise@^5.1.4, nise@^5.1.5:
+  version "5.1.5"
+  resolved "https://registry.yarnpkg.com/nise/-/nise-5.1.5.tgz#f2aef9536280b6c18940e32ba1fbdc770b8964ee"
+  integrity sha512-VJuPIfUFaXNRzETTQEEItTOP8Y171ijr+JLq42wHes3DiryR8vT+1TXQW/Rx8JNUhyYYWyIvjXTU6dOhJcs9Nw==
   dependencies:
     "@sinonjs/commons" "^2.0.0"
     "@sinonjs/fake-timers" "^10.0.2"
@@ -24020,10 +23947,10 @@ node-addon-api@^4.2.0:
   resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-4.3.0.tgz#52a1a0b475193e0928e98e0426a0d1254782b77f"
   integrity sha512-73sE9+3UaLYYFmDsFZnqCInzPyh3MqIwZO9cw58yIqAZhONrrabrYyYe3TuIqtIiOuTXVhsGau8hcrhhwSsDIQ==
 
-node-addon-api@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-5.0.0.tgz#7d7e6f9ef89043befdb20c1989c905ebde18c501"
-  integrity sha512-CvkDw2OEnme7ybCykJpVcKH+uAOLV2qLqiyla128dN9TkEWfrYmxG6C2boDe5KcNQqZF3orkqzGgOMvZ/JNekA==
+node-addon-api@^6.1.0:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-6.1.0.tgz#ac8470034e58e67d0c6f1204a18ae6995d9c0d76"
+  integrity sha512-+eawOlIgy680F0kBzPUNFhMZGtJ1YmqM6l4+Crf4IkImjYrO/mqPwRMh352g23uIaQKFItcQ64I7KMaJxHgAVA==
 
 node-dir@^0.1.10, node-dir@^0.1.17:
   version "0.1.17"
@@ -27029,7 +26956,7 @@ react-dom@17.0.2:
     object-assign "^4.1.1"
     scheduler "^0.20.2"
 
-react-dom@18.2.0:
+react-dom@18.2.0, react-dom@^18.2.0:
   version "18.2.0"
   resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-18.2.0.tgz#22aaf38708db2674ed9ada224ca4aa708d821e3d"
   integrity sha512-6IMTriUmvsjHUjNtEDudZfuDQUoWXVxKHhlEGSk81n4YFS+r/Kl99wXiwlVXtPBtJenozv2P+hxDsw9eA7Xo6g==
@@ -27102,10 +27029,10 @@ react-remove-scroll@2.5.5:
     use-callback-ref "^1.3.0"
     use-sidecar "^1.1.2"
 
-react-select@5.7.7:
-  version "5.7.7"
-  resolved "https://registry.yarnpkg.com/react-select/-/react-select-5.7.7.tgz#dbade9dbf711ef2a181970c10f8ab319ac37fbd0"
-  integrity sha512-HhashZZJDRlfF/AKj0a0Lnfs3sRdw/46VJIRd8IbB9/Ovr74+ZIwkAdSBjSPXsFMG+u72c5xShqwLSKIJllzqw==
+react-select@5.8.0:
+  version "5.8.0"
+  resolved "https://registry.yarnpkg.com/react-select/-/react-select-5.8.0.tgz#bd5c467a4df223f079dd720be9498076a3f085b5"
+  integrity sha512-TfjLDo58XrhP6VG5M/Mi56Us0Yt8X7xD6cDybC7yoRMUNm7BGO7qk8J0TLQOua/prb8vUOtsfnXZwfm30HGsAA==
   dependencies:
     "@babel/runtime" "^7.12.0"
     "@emotion/cache" "^11.4.0"
@@ -27149,7 +27076,7 @@ react@17.0.2:
     loose-envify "^1.1.0"
     object-assign "^4.1.1"
 
-react@18.2.0:
+react@18.2.0, react@^18.2.0:
   version "18.2.0"
   resolved "https://registry.yarnpkg.com/react/-/react-18.2.0.tgz#555bd98592883255fa00de14f1151a917b5d77d5"
   integrity sha512-/3IjMdb2L9QbBdWiW5e3P2/npwMBaU9mHCSCUzNln0ZCYbcfTsGbTJrU/kGemdH2IWmB2ioZ+zkxtmq6g09fGQ==
@@ -28443,18 +28370,18 @@ shallow-clone@^3.0.0:
   dependencies:
     kind-of "^6.0.2"
 
-sharp@^0.30.0:
-  version "0.30.7"
-  resolved "https://registry.yarnpkg.com/sharp/-/sharp-0.30.7.tgz#7862bda98804fdd1f0d5659c85e3324b90d94c7c"
-  integrity sha512-G+MY2YW33jgflKPTXXptVO28HvNOo9G3j0MybYAHeEmby+QuD2U98dT6ueht9cv/XDqZspSpIhoSW+BAKJ7Hig==
+sharp@^0.32.0:
+  version "0.32.6"
+  resolved "https://registry.yarnpkg.com/sharp/-/sharp-0.32.6.tgz#6ad30c0b7cd910df65d5f355f774aa4fce45732a"
+  integrity sha512-KyLTWwgcR9Oe4d9HwCwNM2l7+J0dUQwn/yf7S0EnTtb0eVS4RxO0eUSvxPtzT4F3SY+C4K6fqdv/DO27sJ/v/w==
   dependencies:
     color "^4.2.3"
-    detect-libc "^2.0.1"
-    node-addon-api "^5.0.0"
+    detect-libc "^2.0.2"
+    node-addon-api "^6.1.0"
     prebuild-install "^7.1.1"
-    semver "^7.3.7"
+    semver "^7.5.4"
     simple-get "^4.0.1"
-    tar-fs "^2.1.1"
+    tar-fs "^3.0.4"
     tunnel-agent "^0.6.0"
 
 shebang-command@^1.2.0:
@@ -28632,6 +28559,18 @@ sinon@15.2.0:
     nise "^5.1.4"
     supports-color "^7.2.0"
 
+sinon@17.0.0:
+  version "17.0.0"
+  resolved "https://registry.yarnpkg.com/sinon/-/sinon-17.0.0.tgz#626fde5d903c16dba16fd52afdb9917508dd26ae"
+  integrity sha512-p4lJiYKBoOEVUxxVIC9H1MM2znG1/c8gud++I2BauJA5hsz7hHsst35eurNWXTusBsIq66FzOQbZ/uMdpvbPIQ==
+  dependencies:
+    "@sinonjs/commons" "^3.0.0"
+    "@sinonjs/fake-timers" "^11.2.2"
+    "@sinonjs/samsam" "^8.0.0"
+    diff "^5.1.0"
+    nise "^5.1.5"
+    supports-color "^7.2.0"
+
 sinon@^9.0.0:
   version "9.2.4"
   resolved "https://registry.yarnpkg.com/sinon/-/sinon-9.2.4.tgz#e55af4d3b174a4443a8762fa8421c2976683752b"
@@ -29207,10 +29146,10 @@ streamsearch@^1.1.0:
   resolved "https://registry.yarnpkg.com/streamsearch/-/streamsearch-1.1.0.tgz#404dd1e2247ca94af554e841a8ef0eaa238da764"
   integrity sha512-Mcc5wHehp9aXz1ax6bZUyY5afg9u2rv5cqQI3mRrYkGC8rW2hM02jWuwjtL++LS5qinSyhj2QfLyNsuc+VsExg==
 
-streamx@^2.12.5:
-  version "2.15.1"
-  resolved "https://registry.yarnpkg.com/streamx/-/streamx-2.15.1.tgz#396ad286d8bc3eeef8f5cea3f029e81237c024c6"
-  integrity sha512-fQMzy2O/Q47rgwErk/eGeLu/roaFWV0jVsogDmrszM9uIw8L5OA+t+V93MgYlufNptfjmYR1tOMWhei/Eh7TQA==
+streamx@^2.12.5, streamx@^2.15.0:
+  version "2.15.2"
+  resolved "https://registry.yarnpkg.com/streamx/-/streamx-2.15.2.tgz#680eacebdc9c43ede7362c2e6695b34dd413c741"
+  integrity sha512-b62pAV/aeMjUoRN2C/9F0n+G8AfcJjNC0zw/ZmOHeFsIe4m4GzjVW9m6VHXVjk536NbdU9JRwKMJRfkc+zUFTg==
   dependencies:
     fast-fifo "^1.1.0"
     queue-tick "^1.0.1"
@@ -29844,6 +29783,15 @@ tar-fs@^2.0.0, tar-fs@^2.1.1:
     pump "^3.0.0"
     tar-stream "^2.1.4"
 
+tar-fs@^3.0.4:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-3.0.4.tgz#a21dc60a2d5d9f55e0089ccd78124f1d3771dbbf"
+  integrity sha512-5AFQU8b9qLfZCX9zp2duONhPmZv0hGYiBPJsyUdqMjzq/mqVpy/rEUSeHk1+YitmxugaptgBh5oDGU3VsAJq4w==
+  dependencies:
+    mkdirp-classic "^0.5.2"
+    pump "^3.0.0"
+    tar-stream "^3.1.5"
+
 tar-stream@^2.1.4, tar-stream@^2.2.0, tar-stream@~2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-2.2.0.tgz#acad84c284136b060dc3faa64474aa9aebd77287"
@@ -29855,6 +29803,15 @@ tar-stream@^2.1.4, tar-stream@^2.2.0, tar-stream@~2.2.0:
     inherits "^2.0.3"
     readable-stream "^3.1.1"
 
+tar-stream@^3.1.5:
+  version "3.1.6"
+  resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-3.1.6.tgz#6520607b55a06f4a2e2e04db360ba7d338cc5bab"
+  integrity sha512-B/UyjYwPpMBv+PaFSWAmtYjwdrlEaZQEhMIBFNC5oEG8lpiW8XjcSdmEaClj28ArfKScKHs2nshz3k2le6crsg==
+  dependencies:
+    b4a "^1.6.4"
+    fast-fifo "^1.2.0"
+    streamx "^2.15.0"
+
 tar@^6.0.2, tar@^6.1.11, tar@^6.1.13, tar@^6.1.2:
   version "6.1.14"
   resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.14.tgz#e87926bec1cfe7c9e783a77a79f3e81c1cfa3b66"
@@ -29948,10 +29905,10 @@ terser-webpack-plugin@^5.3.7:
     serialize-javascript "^6.0.1"
     terser "^5.16.8"
 
-terser@5.22.0, terser@^5.16.8, terser@^5.3.0:
-  version "5.22.0"
-  resolved "https://registry.yarnpkg.com/terser/-/terser-5.22.0.tgz#4f18103f84c5c9437aafb7a14918273310a8a49d"
-  integrity sha512-hHZVLgRA2z4NWcN6aS5rQDc+7Dcy58HOf2zbYwmFcQ+ua3h6eEFf5lIDKTzbWwlazPyOZsFQO8V80/IjVNExEw==
+terser@5.24.0, terser@^5.16.8, terser@^5.7.0:
+  version "5.24.0"
+  resolved "https://registry.yarnpkg.com/terser/-/terser-5.24.0.tgz#4ae50302977bca4831ccc7b4fef63a3c04228364"
+  integrity sha512-ZpGR4Hy3+wBEzVEnHvstMvqpD/nABNelQn/z2r0fjVWGQsN3bpOLzQlqDxmb4CDZnXq5lpjnQ+mHQLAOpfM5iw==
   dependencies:
     "@jridgewell/source-map" "^0.3.3"
     acorn "^8.8.2"
@@ -30477,7 +30434,7 @@ tslib@^1.11.1, tslib@^1.13.0, tslib@^1.9.0:
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
   integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==
 
-tslib@^2.0.0, tslib@^2.0.1, tslib@^2.0.3, tslib@^2.1.0, tslib@^2.3.0, tslib@^2.3.1, tslib@^2.4.0, "tslib@^2.4.1 || ^1.9.3", tslib@^2.5.0:
+tslib@^2.0.0, tslib@^2.0.1, tslib@^2.0.3, tslib@^2.1.0, tslib@^2.3.0, tslib@^2.3.1, tslib@^2.4.0, tslib@^2.5.0:
   version "2.6.2"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.2.tgz#703ac29425e7b37cd6fd456e92404d46d1f3e4ae"
   integrity sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==
@@ -30701,10 +30658,10 @@ underscore@~1.8.3:
   resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.8.3.tgz#4f3fb53b106e6097fcf9cb4109f2a5e9bdfa5022"
   integrity sha512-5WsVTFcH1ut/kkhAaHf4PVgI8c7++GiVcpCGxPouI6ZVjsqPnSDf8h/8HtVqc0t4fzRXwnMK70EcZeAs3PIddg==
 
-undici-types@~5.25.1:
-  version "5.25.3"
-  resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-5.25.3.tgz#e044115914c85f0bcbb229f346ab739f064998c3"
-  integrity sha512-Ga1jfYwRn7+cP9v8auvEXN1rX3sWqlayd4HP7OKk4mZWylEmu3KzXDUGrQUN6Ol7qo1gPvB2e5gX6udnyEPgdA==
+undici-types@~5.26.4:
+  version "5.26.5"
+  resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-5.26.5.tgz#bcd539893d00b56e964fd2657a4866b221a65617"
+  integrity sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==
 
 undici@^5.22.1:
   version "5.22.1"
@@ -31826,10 +31783,10 @@ workerpool@^3.1.1:
     object-assign "4.1.1"
     rsvp "^4.8.4"
 
-workerpool@^6.0.0, workerpool@^6.0.2, workerpool@^6.0.3, workerpool@^6.4.0:
-  version "6.4.1"
-  resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-6.4.1.tgz#1398eb5f8f44fb2d21ed9225cf34bb0131504c1d"
-  integrity sha512-zIK7qRgM1Mk+ySxOJl7ZpjX6SlKt5gugxzl8eXHPdbpXX8iDAaVIxYJz4Apn6JdDxP2buY/Ekqg0bOLNSf0u0g==
+workerpool@^6.0.2, workerpool@^6.0.3, workerpool@^6.1.5, workerpool@^6.4.0:
+  version "6.5.1"
+  resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-6.5.1.tgz#060f73b39d0caf97c6db64da004cd01b4c099544"
+  integrity sha512-Fs4dNYcsdpYSAfVxhnl1L5zTksjvOJxtC5hzMNl+1t9B8hTJTdKDyZ5ju7ztgPy+ft9tBFXoOlDNiOT9WUXZlA==
 
 "wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0:
   version "7.0.0"